- 06 Jul, 2006 22 commits
-
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-amerge scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
-
unknown authored
into trift2.:/M51/bug20216-5.1 scripts/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-ateam sql/field.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/field.cc: Manual merge sql/sql_insert.cc: Manual merge sql/table.cc: Manual merge
-
unknown authored
into trift2.:/M51/merge-5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
-
unknown authored
- missing order by
-
unknown authored
mysql-test/r/archive.result: After merge fix. It might come from the fix for bug 1662 (ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY) sql/time.cc: After merge fix. Auto resolve failed because this piece of code was moved from another file to here.
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb storage/ndb/src/ndbapi/DictCache.cpp: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/ndbapi/DictCache.cpp: Auto merged
-
unknown authored
- don't invalidate tables that are in state RETRIEVING
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-ateam libmysqld/lib_sql.cc: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/myisam.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql-common/client.c: Auto merged sql/opt_sum.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/table.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_mbr.c: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/ctype_utf8.result: Manual merge mysql-test/r/key.result: Manual merge mysql-test/t/ctype_utf8.test: Manual merge sql/item_timefunc.cc: Manual merge
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
-
unknown authored
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-ateam
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/ndbapi/NdbScanOperation.cpp: SCCS merged
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1 storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged
-
unknown authored
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new-ndb
-
unknown authored
mysql-test/t/ndb_dd_advance.test: ndb_dd_advance.test mysql-test/t/ndb_dd_advance2.test: ndb_dd_advance2.test mysql-test/r/ndb_dd_advance.result: ndb_dd_advance.result mysql-test/r/ndb_dd_advance2.result: ndb_dd_advance2.result
-
- 05 Jul, 2006 18 commits
-
-
unknown authored
- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Bug #20843 tests fails randomly with assertion in completeClusterFailed reenabled test
-
unknown authored
Delete: mysql-test/r/ndb_dd_advance.result .del-ndb_dd_advance2.result~89be9fe55c2fda5a: Delete: mysql-test/r/ndb_dd_advance2.result .del-ndb_dd_advance2.test~e9e56bc3e8e8f740: Delete: mysql-test/t/ndb_dd_advance2.test .del-ndb_dd_advance.test~58e757b6c1d33996: Delete: mysql-test/t/ndb_dd_advance.test BitKeeper/deleted/.del-ndb_dd_advance.test~58e757b6c1d33996: Delete: mysql-test/t/ndb_dd_advance.test BitKeeper/deleted/.del-ndb_dd_advance2.test~e9e56bc3e8e8f740: Delete: mysql-test/t/ndb_dd_advance2.test BitKeeper/deleted/.del-ndb_dd_advance2.result~89be9fe55c2fda5a: Delete: mysql-test/r/ndb_dd_advance2.result BitKeeper/deleted/.del-ndb_dd_advance.result~165b282a93715547: Delete: mysql-test/r/ndb_dd_advance.result
-
unknown authored
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
-
unknown authored
-
unknown authored
mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
-
unknown authored
- reenabled test as this now seems fixed
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged
-
unknown authored
- updated error message to more correctly reflect the issue
-
unknown authored
Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does). mysql-test/mysql-test-run.pl: Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:" line in its output, because otherwise we lack the information how the test suite was run. Add the line.
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
-
unknown authored
-
unknown authored
storage/ndb/src/ndbapi/Ndb.cpp: try to catch autoincr 'error 0'
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1 storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged
-
unknown authored
scripts/make_binary_distribution.sh: Auto merged
-