- 30 Nov, 2006 3 commits
-
-
unknown authored
The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops: for any value of the byte x x | 1 -> 1, and x & 0 -> 0. x, being a null_byte part of record[1] can be left unassigned even after ha_innobase::index_read_idx because the above and still be correct. Addding a check memory upon the invocation of the function can detect this fact long before record[1], old record, is eventually passed to my_write. Fixed with initialization of record[1]'s null_bytes part in open_table_from_share. sql/table.cc: initialization of null-bytes for valgrind.
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
-
unknown authored
sql/sql_trigger.cc: Another post-merge fix: make TRIGGER privilege work again, after IF EXISTS refactoring.
-
- 29 Nov, 2006 28 commits
-
-
unknown authored
mysql-test/r/func_str.result: Update results (a post-merge fix).
-
unknown authored
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_life_cycle.result: Auto merged mysql-test/r/rpl_trigger.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/rpl_trigger.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_cache.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/lib/mtr_process.pl: Use local. mysql-test/r/func_str.result: SCCS merged mysql-test/t/func_str.test: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_yacc.yy: Manual merge.
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-4.1-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge sql/sql_yacc.yy: Auto merged
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/t/udf.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
Changed paths to ndb include directory to include "storage" Makefile.am: Adjusted path to yaSSL libtool libraries ssl.m4: Use libtool way of specifying yaSSL libraries config/ac-macros/ssl.m4: Use libtool way of specifying yaSSL libraries libmysqld/Makefile.am: Adjusted path to yaSSL libtool libraries storage/ndb/config/type_kernel.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_ndbapi.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_ndbapitest.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_ndbapitools.mk.am: Changed paths to ndb include directory to include "storage" storage/ndb/config/type_util.mk.am: Changed paths to ndb include directory to include "storage"
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch configure.in: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysql_priv.h: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 sql/sql_yacc.yy: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637 sql/sql_yacc.yy: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.1-build Docs/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/benchmark.dsp: Auto merged extra/yassl/taocrypt/taocrypt.dsp: Auto merged extra/yassl/taocrypt/taocrypt.vcproj: Auto merged extra/yassl/taocrypt/test.dsp: Auto merged extra/yassl/testsuite/testsuite.dsp: Auto merged extra/yassl/yassl.dsp: Auto merged extra/yassl/yassl.vcproj: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_newdecimal.test: Auto merged sql/Makefile.am: Auto merged sql/filesort.cc: Auto merged sql/handler.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged strings/decimal.c: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.1-build sql-common/my_time.c: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.1-build mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-build
-
unknown authored
Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from inside a stored routine and MySQL is compiled with Query Cache support (this is not in the manual). The problem was that the condition test of "we are inside stored routine" was reversed, thus CONCURRENT _worked only_ from stored routine. The solution is to use proper condition test. No test case is provided because the test case would require a large amount of input, and it's hard to tell is SELECT is really blocked or just slow (subject to race). sql/sql_yacc.yy: Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT, which was reversed, and return valid value if we are in SP.
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
mysql-test/mysql-test-run.pl: remove dependency on Data::Dumper, it's not used anywhere
-
unknown authored
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt sql/sql_parse.cc: Auto merged
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge libmysql/libmysql.c: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/func_str.test: Auto merged mysql-test/t/ps.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged server-tools/instance-manager/mysql_connection.cc: Rollback Monty's removals of explicit casts tests/mysql_client_test.c: SCCS merged
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql/item_sum.cc: Auto merged tests/mysql_client_test.c: Manual merge: use local.
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
-
unknown authored
storage/archive/ha_archive.cc: Removed Varchar cleanup hack. I'm going to commit new pack code.
-
- 28 Nov, 2006 9 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/wait_for_socket.sh: Manual merge. sql/sql_cache.cc: Manual merge.
-
unknown authored
into bodhi.local:/opt/local/work/mysql-4.1-runtime libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql/item_sum.cc: Auto merged
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/field.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged plugin/fulltext/plugin_example.c: e C sql/field.h: e
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.1-build client/mysql_upgrade.c: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql-common/my_time.c: Auto merged
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.1-24486 sql/sql_parse.cc: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge client/mysql_upgrade.c: Auto merged mysql-test/lib/mtr_report.pl: Auto merged sql-common/my_time.c: Auto merged mysql-test/mysql-test-run.pl: SCCS merged
-
unknown authored
deadlock_innodb:events_grant". This was a memory leak introduced by the patch for Bug 22830. Post-review fixes. sql/sql_parse.cc: A fix for Bug#24486 "Valgrind warnings: sp_head(), deadlock_innodb:events_grant": delete the sphead object before returning with an error.
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-