- 08 Feb, 2006 3 commits
-
-
unknown authored
The problem is that LEX_STRING was used instead of LEX_STRING::str. sql/sql_trigger.cc: Fix typo: we should have used LEX_STRING::str instead of LEX_STRING.
-
unknown authored
-
unknown authored
mysql-test/r/binlog_row_blackhole.result: Update test results to reflect use of std_data_ln mysql-test/r/rpl_row_flsh_tbls.result: Update test results, drop tables to clean up mysql-test/r/rpl_row_log.result: Update test results to reflect use of std_data_ln
-
- 07 Feb, 2006 24 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/extra/rpl_tests/rpl_stm_000001.test: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl_loaddata.result: Auto merged mysql-test/r/rpl_loaddata_m.result: Auto merged mysql-test/r/rpl_loaddata_s.result: Auto merged mysql-test/r/rpl_misc_functions.result: Auto merged mysql-test/r/rpl_replicate_do.result: Auto merged mysql-test/r/rpl_stm_000001.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/trigger-compat.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_loaddata_m.test: Auto merged mysql-test/t/rpl_loaddata_s.test: Auto merged mysql-test/t/rpl_misc_functions.test: Auto merged mysql-test/t/rpl_replicate_do.test: Auto merged mysql-test/t/sp-security.test: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/t/trigger-compat.test: Auto merged mysql-test/t/trigger-grant.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/type_varchar.test: Auto merged mysql-test/t/view.test: Auto merged sql-common/client.c: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
-
unknown authored
mysql-test/r/sp-prelocking.result: Update test result mysql-test/t/sp-prelocking.test: One drop too many
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
mysql-test/r/rpl_failed_optimize.result: Updates test result mysql-test/r/rpl_insert_id.result: Updates test result mysql-test/r/rpl_loaddata.result: Updates test result mysql-test/r/rpl_loaddata_s.result: Updates test result mysql-test/r/rpl_multi_update3.result: Updates test result
-
unknown authored
mysql-test/r/ndb_binlog_ignore_db.result: New BitKeeper file ``mysql-test/r/ndb_binlog_ignore_db.result'' mysql-test/t/ndb_binlog_ignore_db-master.opt: New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db-master.opt'' mysql-test/t/ndb_binlog_ignore_db.test: New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db.test''
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new client/mysqltest.c: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/type_float.test: Auto merged mysql-test/t/variables.test: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new client/mysqltest.c: Auto merged sql/sql_db.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new mysql-test/extra/rpl_tests/rpl_stm_000001.test: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl_loaddata.result: Auto merged mysql-test/r/rpl_loaddata_m.result: Auto merged mysql-test/r/rpl_loaddata_s.result: Auto merged mysql-test/r/rpl_misc_functions.result: Auto merged mysql-test/r/rpl_replicate_do.result: Auto merged mysql-test/r/rpl_stm_000001.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_loaddata_m.test: Auto merged mysql-test/t/rpl_loaddata_s.test: Auto merged mysql-test/t/rpl_misc_functions.test: Auto merged mysql-test/t/rpl_replicate_do.test: Auto merged mysql-test/t/trigger-compat.test: Auto merged mysql-test/t/type_varchar.test: Auto merged mysql-test/r/mysqltest.result: Merge 5.0 -> 5.1 mysql-test/t/trigger-grant.test: "Use local" when merging 5.0 -> 5.1
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var mysql-test/t/mysqltest.test: Auto merged
-
unknown authored
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl_loaddata_m.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/read_only.test: Auto merged mysql-test/t/sp-security.test: Auto merged mysql-test/t/trigger-compat.test: Auto merged mysql-test/t/view_grant.test: Auto merged mysql-test/r/trigger-compat.result: Merge 5.0 -> 5.1
-
unknown authored
into big_geek.:C:/Work/mysql/mysql-5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases into neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases mysql-test/mysql-test-run.pl: Auto merged mysql-test/extra/binlog_tests/ctype_cp932.test: Auto merged mysql-test/extra/rpl_tests/rpl_flsh_tbls.test: Auto merged mysql-test/extra/rpl_tests/rpl_stm_000001.test: Auto merged mysql-test/r/binlog_stm_ctype_cp932.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl000017.result: Auto merged mysql-test/r/rpl_loaddata.result: Auto merged mysql-test/r/rpl_loaddata_s.result: Auto merged mysql-test/r/rpl_replicate_do.result: Auto merged mysql-test/r/rpl_stm_000001.result: Auto merged mysql-test/r/rpl_stm_flsh_tbls.result: Auto merged mysql-test/r/sp-prelocking.result: Auto merged mysql-test/r/type_bit.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl000017.test: Auto merged mysql-test/t/rpl_replicate_do.test: Auto merged mysql-test/t/sp-prelocking.test: Auto merged mysql-test/t/trigger-compat.test: Auto merged mysql-test/t/variables.test: Auto merged mysql-test/t/view_grant.test: Auto merged mysql-test/r/rpl_loaddata_m.result: Merge 5.0->5.1 mysql-test/t/rpl_failed_optimize.test: Merge 5.0->5.1 mysql-test/t/rpl_insert_id.test: Merge 5.0->5.1 mysql-test/t/rpl_loaddata.test: Merge 5.0->5.1 mysql-test/t/rpl_loaddata_m.test: Merge 5.0->5.1 mysql-test/t/rpl_loaddata_s.test: Merge 5.0->5.1 mysql-test/t/rpl_multi_update3.test: Merge 5.0->5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/kostja/mysql/mysql-5.1-merge mysql-test/r/information_schema_db.result: Auto merged sql/ha_archive.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.h: Auto merged mysql-test/r/information_schema.result: SCCS merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
-
unknown authored
-
unknown authored
Bug #17154 load data infile hangs when duplicate key encountered mysql-test/r/ndb_load.result: New BitKeeper file ``mysql-test/r/ndb_load.result'' mysql-test/t/ndb_load.test: New BitKeeper file ``mysql-test/t/ndb_load.test''
-
unknown authored
init both pos and len storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: init both pos and len
-
unknown authored
-
unknown authored
storage/ndb/include/ndbapi/NdbDictionary.hpp: ndb, added additional getters on NdbDictionary::Event storage/ndb/src/ndbapi/NdbDictionary.cpp: ndb, added additional getters on NdbDictionary::Event storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: ndb, added additional getters on NdbDictionary::Event storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: ndb, added additional getters on NdbDictionary::Event
-
- 06 Feb, 2006 13 commits
-
-
unknown authored
-
unknown authored
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new sql/ha_ndbcluster.cc: Auto merged sql/share/errmsg.txt: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Auto merged storage/ndb/test/ndbapi/test_event.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: SCCS merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
-
unknown authored
into mysql.com:/home/psergey/mysql-5.1-wl2985-postfixes
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
-
unknown authored
-
unknown authored
-
unknown authored
+ added current test printout to error file mysql-test/lib/mtr_cases.pl: harmonized mysql-test-run.sh and .pl
-
unknown authored
mysql-test/r/trigger-grant.result: Updated result file: use TRIGGER instead of SUPER for BUG#15166/15196 tests. sql/item.cc: Updated according to the 5.1 data structures.
-
unknown authored
rename error codes mysql-test/t/ndb_dd_ddl.test: rename error code sql/ha_ndbcluster.cc: rename error code sql/share/errmsg.txt: rename error code
-
unknown authored
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree mysql-test/r/trigger-grant.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/t/trigger-grant.test: Merged. sql/sql_trigger.cc: Merged.
-
unknown authored
mysql-test/t/ctype_ucs.test: Auto merged
-