- 21 Jun, 2006 2 commits
- 19 Jun, 2006 16 commits
-
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into mysql.com:/home/alik/MySQL/devel/5.0-tree-merged
-
unknown authored
into mysql.com:/home/alik/MySQL/devel/5.0-rt mysql-test/mysql-test-run.pl: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
BUG#18036 - update of table joined to self reports table as crashed Set exclude_from_table_unique_test value back to FALSE. It is needed for further check in multi_update::prepare whether to use record cache. sql/sql_update.cc: Set exclude_from_table_unique_test value back to FALSE. It is needed for further check in multi_update::prepare whether to use record cache.
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge mysql-test/r/mysqldump.result: Auto merged mysql-test/t/mysqldump.test: Auto merged
-
unknown authored
mysql-test/r/mysqldump.result: Changed to other database (BUG#20531 hinders usage of 'test' database) mysql-test/t/mysqldump.test: Changed to other database (BUG#20531 hinders usage of 'test' database)
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 include/my_global.h: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 mysql-test/r/myisam.result: Manual merge. mysql-test/t/myisam.test: Manual merge. sql/sql_update.cc: Manual merge.
-
unknown authored
server-tools/instance-manager/guardian.cc: Removed erroneous unlock() in Guardian_thread::init(): instance_map is unlocked in the caller. server-tools/instance-manager/instance_map.cc: Added TODO comment. server-tools/instance-manager/manager.cc: Make initialization of alarm infrustructure before starting Guardian thread, because Guardian uses thr_alarm().
-
unknown authored
- fix for IM stopping routine; - polishing. mysql-test/lib/mtr_process.pl: Polishing: make mtr_kill_process() more verbose in debug mode. mysql-test/mysql-test-run.pl: 1. Fix stopping of IM running as a daemon -- after death of the main IM process, we should wait for the IM angel to die. 2. Polishing -- be more verbose in debug mode.
-
unknown authored
can be started several times; monitor interval must be > 2sec mysql-test/r/im_daemon_life_cycle.result: Updated result file. mysql-test/r/im_life_cycle.result: Updated result file. mysql-test/r/im_utils.result: Updated result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set monitoring interval to 1 second in order to: - be consistent with 5.1; - speed up tests; mysql-test/t/im_daemon_life_cycle.imtest: 1. Use wait_for_start.sh script to minimize chance of race condition. 2. Polishing. mysql-test/t/im_life_cycle.imtest: 1. Use wait_for_start.sh and wait_for_stop.sh scripts to minimize chance of race condition; 2. Remove some statements, because there is no way now to stabilize their output. 3. Polishing; mysql-test/t/im_utils.imtest: 1. Use wait_for_start.sh script to minimize chance of race condition. 2. Polishing. mysql-test/t/kill_n_check.sh: 1. Make timeout configurable by command-line argument; 2. Change algorithm of waiting for process to restart to be more robust. mysql-test/t/im_life_cycle-im.opt: Set monitoring interval to 1 second in order to: - be consistent with 5.1; - speed up tests; mysql-test/t/im_utils-im.opt: Set monitoring interval to 1 second in order to: - be consistent with 5.1; - speed up tests; mysql-test/t/wait_for_process.sh: A new helper script, intended to be used instead of dummy "sleep" when waiting for some process to start or stop.
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge client/mysqldump.c: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/t/mysqldump.test: Auto merged sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
-
unknown authored
Certain updates of table joined to self results in unexpected behavior. The problem was that record cache was mistakenly enabled for self-joined table updates. Normally record cache must be disabled for such updates. Fixed wrong condition in code that determines whether to use record cache for self-joined table updates. Only MyISAM tables were affected. mysql-test/r/myisam.result: Test case for BUG#18036. mysql-test/t/myisam.test: Test case for BUG#18036. sql/sql_update.cc: Fixed wrong condition in code that determines whether to use record cache for self-joined table updates.
-
- 18 Jun, 2006 3 commits
-
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/item_func.cc: Auto merged sql/sql_lex.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
-
- 17 Jun, 2006 11 commits
-
-
unknown authored
into clam.ndb.mysql.com:/space/pekka/ndb/version/my50
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new ndb/Makefile.am: Auto merged
-
unknown authored
Avoid error message trying 'windoze-dsp' in obsolete directory compile-dist: Avoid error message for target 'distclean' and no Makefile BUILD/compile-dist: Avoid error message for target 'distclean' and no Makefile ndb/Makefile.am: Avoid error message trying 'windoze-dsp' in obsolete directory
-
unknown authored
into clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
-
unknown authored
ndb/src/ndbapi/NdbBlob.cpp: bug#19285 minor fixes ndb/src/ndbapi/ndberror.c: bug#19285 minor fixes
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new scripts/make_win_src_distribution.sh: Auto merged
-
unknown authored
Make output less verbose Make temporary directory name unique Remove temporary directory on interrupt scripts/make_win_src_distribution.sh: Make output less verbose Make temporary directory name unique Remove temporary directory on interrupt
-
unknown authored
Don't try copy non existing extra/{sql_state,mysqld_error}.h scripts/make_win_src_distribution.sh: Don't try copy non existing extra/{sql_state,mysqld_error}.h
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new scripts/make_win_src_distribution.sh: Auto merged
-
unknown authored
Include "sql_yacc.yy" for completeness (bug#20387) scripts/make_win_src_distribution.sh: Include "sql_yacc.yy" for completeness (bug#20387) Improved error handling Don't list all files packed with tar/zip unless debugging
-
unknown authored
BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571: Auto merged
-
- 16 Jun, 2006 8 commits
-
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/archive.result: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/ndb_lock.result: Auto merged mysql-test/r/rpl_log.result: Auto merged mysql-test/t/archive.test: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/ndb_lock.test: Auto merged mysql-test/t/rpl_log.test: Auto merged sql/ha_archive.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_func.cc: Auto merged sql/sql_lex.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/archive.result: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/ndb_lock.result: Auto merged mysql-test/r/rpl_log.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/archive.test: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/ndb_lock.test: Auto merged mysql-test/t/rpl_log.test: Auto merged mysql-test/t/select.test: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/sql_lex.cc: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
After merge fix mysql-test/r/select.result: After merge fix
-
unknown authored
Changes for Netware sql/net_serv.cc: Netware needs <sys/select.h> configure.in: Call of "comp_err" has moved, changed code for Netware that edits make files to reflect this netware/BUILD/compile-netware-END: After correcting "configure.in" to edit make files correctly, removed obsolete "sed" of "extra/Makefile.am" for Netware
-
unknown authored
sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged
-
unknown authored
into moonbone.local:/work/tmp_merge-5.0-opt-mysql mysql-test/r/cast.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.cc: Auto merged
-
unknown authored
configure.in: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged
-
unknown authored
Delete: netware/mysql_install.def Makefile.am: Removed obsolete "mysql_install.def" netware/Makefile.am: Removed obsolete "mysql_install.def" BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571: Delete: netware/mysql_install.def
-