- 21 Jun, 2006 11 commits
-
-
unknown authored
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/sql_insert.cc: Auto merged
-
unknown authored
Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/mysql_priv.h: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_insert.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_parse.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_table.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure
-
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 26 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 dator5.(none):/home/pappa/bug19281 mysql-test/t/partition_mgm.test: Auto merged
-
unknown authored
New test cases mysql-test/r/partition_error.result: New test cases mysql-test/r/partition_mgm.result: New test cases mysql-test/t/partition_error.test: New test cases mysql-test/t/partition_mgm.test: New test cases
-
unknown authored
into dator5.(none):/home/pappa/bug16000
-
unknown authored
into dator5.(none):/home/pappa/bug19281
-
unknown authored
into dator5.(none):/home/pappa/bug19309 sql/sql_table.cc: Auto merged mysql-test/r/partition.result: manual merge mysql-test/t/partition.test: manual merge
-
unknown authored
into dator5.(none):/home/pappa/bug19281
-
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
sql/table.cc: Remove error printouts when error occurs during open frm as part of CREATE/ALTER TABLE sql/unireg.cc: Ensure .par file is removed after error
-
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
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/ha_partition.cc: Auto 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 3 commits