- 22 Jun, 2006 2 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged
-
unknown authored
create tablespace/logfile group should "back out changes" mysql-test/r/ndb_dd_ddl.result: add testcase for bug#16341 mysql-test/t/ndb_dd_ddl.test: add testcase for bug#16341 sql/ha_ndbcluster.cc: If create data/undo file fails, check if filegroup is same version, and if it is drop it (wo/ checking error) storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp: add version to createfileconf storage/ndb/include/ndbapi/NdbDictionary.hpp: Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far) storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: add version to createfileconf storage/ndb/src/ndbapi/NdbDictionary.cpp: Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far) storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far) storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
-
- 21 Jun, 2006 12 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged
-
unknown authored
make sure tablename is release in case of alter table storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: make sure tablename is release in case of alter table
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
-
unknown authored
also close scan which are in "delivered" state, as it's impossible to release locks afterwards backport from 5.1 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: ndb - bug#20197 also close scan which are in "delivered" state, as it's impossible to release locks afterwards
-
unknown authored
varpages did not get freed on drop table storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Add continueb for freeing varpages storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Add continueb for freeing varpages storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: add dropping of varpages storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Add continueb for freeing varpages storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Add list of varpage chunks storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Add list of varpage chunks
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/51-jonas storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/50-jonas ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions BUILD/compile-ndb-autotest: New BitKeeper file ``BUILD/compile-ndb-autotest''
-
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 9 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 serg.mylan:/usr/home/serg/Abk/mysql-5.1
-
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
-