- 21 Jun, 2006 9 commits
-
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/t/disabled.def: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1 sql/ha_ndbcluster.h: Auto merged mysql-test/r/ndb_replace.result: Merge sql/ha_ndbcluster.cc: Merge
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/ndbapi/ndberror.c: Auto merged
-
- 20 Jun, 2006 17 commits
-
-
unknown authored
-
unknown authored
mysql-test/r/im_life_cycle.result: Fix manual merge.
-
unknown authored
into mysql.com:/home/alik/MySQL/devel/5.1-merged
-
unknown authored
Corrected test case result mysql-test/r/rpl_ndb_log.result: Corrected test case result
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/ndbapi/ndberror.c: manual merge
-
unknown authored
-
unknown authored
-
unknown authored
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
-
unknown authored
Fixed failing test case mysql-test/r/rpl_ndb_log.result: Fixed failing test case
-
unknown authored
into mysql.com:/home/alik/MySQL/devel/5.1-merged BitKeeper/deleted/.del-im_life_cycle-im.opt: Delete: mysql-test/t/im_life_cycle-im.opt BitKeeper/deleted/.del-im_utils-im.opt: Delete: mysql-test/t/im_utils-im.opt mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/im_daemon_life_cycle-im.opt: Auto merged mysql-test/t/trigger.test: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged mysql-test/r/im_life_cycle.result: Manually merged. mysql-test/r/insert.result: Manually merged. mysql-test/t/im_daemon_life_cycle.imtest: Manually merged. mysql-test/t/im_life_cycle.imtest: Manually merged. mysql-test/t/im_utils.imtest: Manually merged. mysql-test/t/insert.test: Manually merged. server-tools/instance-manager/guardian.cc: Manually merged. server-tools/instance-manager/manager.cc: Manually merged. sql/sql_insert.cc: Manually merged.
-
unknown authored
- add error message
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1 configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/myisam.result: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_update.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/myisam.test: Manual merge.
-
unknown authored
Removed reference to missing "tools" directory mysql.spec.sh: Changed flag --with-yassl => --with-ssl Reverted accidental removal of the "make" call :-) Configure --with-embedded-server Corrected path to "libtool" command Corrected path to "libmysqld.a" Removed references to "safe_mysqld" support-files/mysql.spec.sh: Changed flag --with-yassl => --with-ssl Reverted accidental removal of the "make" call :-) Configure --with-embedded-server Corrected path to "libtool" command Corrected path to "libmysqld.a" Removed references to "safe_mysqld" scripts/make_win_src_distribution.sh: Removed reference to missing "tools" directory
-
unknown authored
sql/item_func.cc: Auto merged sql/sql_lex.cc: Auto merged storage/ndb/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged BUILD/compile-dist: SCCS merged netware/Makefile.am: SCCS merged netware/BUILD/compile-netware-END: SCCS merged
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/5.1/main storage/ndb/include/util/ConfigValues.hpp: Auto merged storage/ndb/src/common/util/ConfigValues.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: manual merge (n/a in 5.1)
-
unknown authored
ndb/src/mgmsrv/MgmtSrvr.cpp: user correct pointer
-
unknown authored
mysql-test/r/ndb_dd_dump.result: fix test result
-
- 19 Jun, 2006 14 commits
-
-
unknown authored
into mysql.com:/home/alik/MySQL/devel/5.1-rt
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
-
unknown authored
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/mysql-5.1-new-rpl sql/sql_base.cc: Auto merged
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
-
unknown authored
The bug was found in rpl_stm_000001 testing. In essence the following happens SLAVE thread receives what happens start init THD and its temp_table (tt0) stop storing tt0 pointer to rli->save... start restoring temp_tables - new pointer tt1 executing regular binlog event DROP temp_table at the end of which tt1-refered list must be empty (slave_open_temp_tables == 0) but the pointer refers to tt0 location! shutdown end_slave calls cleaning of temp_tables and crashes. The reason of the crash is that tt1 values is not zero upon DROPing the single temp table. This is due to alg of removing links from temp_tables list which "adapted" 5.0 code but w/o accounting that thd->temporary_tables in slave thread in prone to freeing. Upon freeing there is no more original '0' value available to denote empty list. temporary_tables must not refer to any "external" location, one of which thd->temporary_tables represents (since belong to THD instance). The fix done in sql_base.cc for two functions, look at there for details. sql/sql_base.cc: refining prepend and remove link operation to thd->temporary_tables. The list turns to be "flat" double-linked, i.e "prev" accessor refers to an item instead of pointer to one as it was previously with "open_prev". On removal an invariant involving slave_open_temp_tables counter is checked. When it is zero thd->temporary_tables is set to zero explicitly. This can not be done, for what previous code hoped, because thd object changes when slave stop/start while slave's temporary_tables are maintained all the time, until reset/shutdow
-
unknown authored
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
-
unknown authored
Fixed failing test case mysql-test/r/rpl_row_log_innodb.result: Fixed failing test case mysql-test/r/rpl_row_log.result: Fixed failing test case
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1 include/my_global.h: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1 sql/sql_show.cc: Auto merged
-
unknown authored
sql/ha_ndbcluster.cc: fix total extents display for FILES table. fix extra field to also contain UNDO_BUFFER_SIZE
-
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
-