- 11 Jul, 2006 5 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 sql/sql_table.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-amerge sql/handler.h: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
-
unknown authored
into trift2.:/M50/mysql-5.0
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 sql/opt_range.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/Makefile.am: Manual merge.
-
- 10 Jul, 2006 19 commits
-
-
unknown authored
sql/sql_locale.cc: "true" -> TRUE
-
unknown authored
into trift2.:/M50/mysql-5.0 configure.in: Auto merged
-
unknown authored
-
unknown authored
sql/sql_locale.cc: Fix Windows compilation failure "cannot convert from 'const char [6]' to 'const BOOL'" and an apparent bug (use of "FALSE" instead of FALSE for initialization of is_ascii member of MY_LOCALE)
-
unknown authored
-
unknown authored
mysql-test/r/myisam.result: Fix test results. mysql-test/t/myisam.test: In 5.0 show create table also outputs data directory. For the test for Bug#8706 it's MYSQLTEST_VARDIR, and there is no way to replace it with anything else in test output.
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 ndb/include/kernel/GlobalSignalNumbers.h: Auto merged ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged
-
unknown authored
ndb/src/kernel/blocks/dbdict/DictLock.txt: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/blocks/dbdih/Dbdih.hpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/vm/SimulatedBlock.cpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/vm/SimulatedBlock.hpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/test/run-test/daily-basic-tests.txt: wait until SL_STARTED before sending DICT_UNLOCK_ORD
-
unknown authored
ndb/include/kernel/GlobalSignalNumbers.h: 5.0 : add NODE_START_REP from 5.1 ndb/src/common/debugger/signaldata/SignalNames.cpp: 5.0 : add NODE_START_REP from 5.1 ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: 5.0 : add NODE_START_REP from 5.1 ndb/src/kernel/vm/SimulatedBlock.cpp: 5.0 : add NODE_START_REP from 5.1 ndb/src/kernel/vm/SimulatedBlock.hpp: 5.0 : add NODE_START_REP from 5.1
-
unknown authored
fails" mysql-test/t/myisam.test: Fix myisam.test to work with non-default mysqltest var directory.
-
unknown authored
VC++Files/libmysqld/libmysqld.dsp: Add sql_locale.cpp VC++Files/libmysqld/libmysqld.vcproj: Add sql_locale.cpp VC++Files/sql/mysqld.dsp: Add sql_locale.cpp VC++Files/sql/mysqld.vcproj: Add sql_locale.cpp
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
-
unknown authored
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: non-debug compile fix
-
unknown authored
into trift2.:/M50/mysql-5.0
-
unknown authored
support-files/mysql.spec.sh: Fix a typing error in the "make" target for the Perl script to run the tests.
-
unknown authored
into trift2.:/M50/back23-5.0 support-files/mysql.spec.sh: Auto merged
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
-
unknown authored
mysql-test/Makefile.am: fix cp of mode 444 files
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
-
- 09 Jul, 2006 1 commit
-
-
unknown authored
between pointer to function and pointer to object. sql/item_func.cc: Use typedef names instead of hard-coded types for udf init/deinit functions. sql/sql_udf.cc: Use typedef names for udf function types.
-
- 08 Jul, 2006 3 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 myisam/mi_create.c: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/federated.result: Manual merge. mysql-test/t/federated.test: Manual merge.
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-amerge
-
unknown authored
-
- 07 Jul, 2006 5 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 BitKeeper/etc/ignore: auto-union libmysqld/Makefile.am: Auto merged myisam/mi_create.c: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/Makefile.am: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/myisam.result: Manual merge. mysql-test/t/myisam.test: Manual merge. sql/set_var.cc: Manual merge. sql/set_var.h: Manual merge. sql/sql_cache.cc: Manual merge. sql/sql_class.cc: Manual merge.
-
unknown authored
BitKeeper/etc/ignore: Modify ignore list to work with BitKeeper 4 mysql-test/t/mysqldump.test: Fix the test for Bug#18462 to use MYSQLTEST_VARDIR instead of mysql-test/ directory for temporary files.
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/sql_update.cc: Manual merge.
-
unknown authored
into mysql.com:/space_old/pekka/ndb/version/my50-bug20847 BitKeeper/etc/config: auto ndb/src/kernel/blocks/ERROR_codes.txt: manual ndb/src/kernel/blocks/dbtup/Dbtup.hpp: SCCS merged ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: SCCS merged ndb/test/ndbapi/testDict.cpp: SCCS merged ndb/test/run-test/daily-basic-tests.txt: SCCS merged sql/opt_range.cc: SCCS merged
-
unknown authored
ndb/src/kernel/blocks/ERROR_codes.txt: DbtupTabDesMan: add merge with left buddies ndb/src/kernel/blocks/dbtup/Dbtup.hpp: DbtupTabDesMan: add merge with left buddies ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: DbtupTabDesMan: add merge with left buddies ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: DbtupTabDesMan: add merge with left buddies ndb/test/ndbapi/testDict.cpp: DbtupTabDesMan: add merge with left buddies ndb/test/run-test/daily-basic-tests.txt: DbtupTabDesMan: add merge with left buddies
-
- 06 Jul, 2006 7 commits
-
-
unknown authored
into ymer.(none):/usr/local/mysql/tmp-5.0
-
unknown authored
Fix random failures in test 'wait_timeout' that depend on exact timing. 1. Force a reconnect initially if necessary, as otherwise slow startup might have caused a connection timeout before the test can even start. 2. Explicitly disconnect the first connection to remove confusion about which connection aborts from timeout, causing test failure. mysql-test/r/wait_timeout.result: Fix two races in test. mysql-test/t/wait_timeout.test: Fix two races in test.
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-amerge mysql-test/r/key.result: Auto merged mysql-test/t/key.test: Auto merged sql-common/client.c: Auto merged sql/table.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-ateam sql/field.cc: Auto merged sql/table.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-bug16218 sql/field.cc: Auto merged sql/field.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/table.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
-