1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-05 01:43:31 +03:00
Commit Graph

420 Commits

Author SHA1 Message Date
unknown
9a698169bc Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails):
Restarting scan after call to delete_row().


mysql-test/include/rpl_multi_engine3.inc:
  Injector thread was not given enough time.
mysql-test/t/disabled.def:
  Disabling some tests.
sql/log_event.cc:
  Moving scan init functions for Delete_rows_log_event.
  Restarting scan for each found row.
mysql-test/t/rpl_ndb_dd_partitions.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_dd_partitions.test''
2006-04-12 21:19:24 +02:00
unknown
af78db5835 new files
mysql-test/include/master-slave-end.inc:
  New BitKeeper file ``mysql-test/include/master-slave-end.inc''
mysql-test/include/ndb_setup_slave.inc:
  New BitKeeper file ``mysql-test/include/ndb_setup_slave.inc''
2006-04-12 15:56:29 +02:00
unknown
0a8d876d14 Bug#18564 Test failure due to test not checking preconditions
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.


mysql-test/include/have_udf.inc:
  Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/r/have_udf.require:
  Use variable "have_dynamic_loading" to to determine if there is support for udf's
mysql-test/t/disabled.def:
  Remove udf from disabled
sql/mysql_priv.h:
  Add have_dlopen variable
sql/mysqld.cc:
  Add have_dlopen variable
sql/set_var.cc:
  Add have_dlopen variable and name it "have_dynamic_loading" in "SHOW VARIABLES"
2006-04-12 15:13:16 +02:00
unknown
c2feb2141e Merge
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
2006-04-11 02:48:17 +02:00
unknown
99afb2bafd Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
sql/log.cc:
  Auto merged
2006-04-09 19:38:59 +03:00
unknown
9f7215d61b BUG#18906 Test case rpl_temporary fails when using --vardir option
env variable name is fixed.




mysql-test/include/get_binlog_dump_thread_id.inc:
  Fixing to right env $var name.
mysql-test/r/rpl_temporary.result:
  results
2006-04-09 13:27:53 +03:00
unknown
474c502627 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
2006-04-08 18:51:29 +03:00
unknown
e44359014a #18906: bushbuild reports rpl_temporary fails on solaris, AIX, QNX
Removing the problematic line from include test file.


mysql-test/include/get_binlog_dump_thread_id.inc:
  replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
  results
2006-04-08 16:29:11 +03:00
unknown
53731b7e69 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
sql/sql_repl.cc:
  Auto merged
mysql-test/t/rpl_temporary.test:
  manual merge
2006-04-08 15:31:47 +03:00
unknown
3ab267bf81 Bug#17284 erroneous temp table cleanup on slave.
Idea of the fix is for master to send FD event with `created' as 0
     to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
     In a case of a connect by slave to the master after its crash temp tables have been already
     cleaned up so that slave can not keep `orphan' temp tables.


mysql-test/r/rpl_temporary.result:
  results
mysql-test/t/rpl_temporary.test:
  wait-free addon to check temp tables are ok after slave reconnect.
sql/sql_repl.cc:
  Storing zero for assigning to `created' of FD event on the reconnecting slave.
mysql-test/include/get_binlog_dump_thread_id.inc:
  mysqltest's preudo-macro to calculate $id master dump thread id
2006-04-07 20:44:37 +03:00
unknown
2919dceb72 make_binary_distribution.sh:
Split cp operations, to avoid shell limit on number of args
mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc


BitKeeper/deleted/.del-drop-on-restart.inc~ef1715ddbebc3102:
  Delete: mysql-test/include/drop-on-restart.inc
mysql-test/mysql-test-run.pl:
  Removed obsolete way of cleaning up after test failure
scripts/make_binary_distribution.sh:
  Split cp operations, to avoid shell limit on number of args
2006-03-27 06:44:45 +02:00
unknown
0ef3cd6c70 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0
2006-03-23 11:23:05 +01:00
unknown
d16d2df58e New file to remove sleeps in mysql-test-run (backported from 5.1) 2006-03-23 09:19:01 +01:00
unknown
cea5dcf683 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-23 10:25:04 +04:00
unknown
c25669a810 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
2006-03-23 10:19:55 +04:00
unknown
859aa2f24f Merge mysql.com:/usr/home/bar/mysql-4.1.b17374
into  mysql.com:/usr/home/bar/mysql-5.0


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
2006-03-23 10:17:31 +04:00
unknown
9c2bf06651 Changed to real_sleep 2006-03-22 17:28:48 +01:00
unknown
f81a6dbe98 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-03-22 17:28:46 +01:00
unknown
0adda6df52 Dsiable udf.test waiting for a check wheter udf_example.so exists
mysql-test/include/have_udf.inc:
  Add comment that a check for udf_example.so must be made
mysql-test/t/disabled.def:
  Disable udf.test
2006-03-22 12:03:15 +01:00
unknown
8c75683c12 Made rpl_flushlog_loop use wait_slave_status instead of sleep.
This to save 5 seconds of test time.
More test to follow. :-)


mysql-test/r/rpl_flushlog_loop.result:
  Updated result file
mysql-test/t/rpl_flushlog_loop.test:
  Make test use wait_slave_status instead of sleep
2006-03-21 17:40:51 +01:00
unknown
ae7974b112 Bug#11835 CREATE FUNCTION crashes server
- Update for 5.1
 - Add "have_dlopen"
 - Remove requirement to load udf's only in "opt_plugin_dir" 


include/my_global.h:
  Remove duplicate defines
mysql-test/include/have_udf.inc:
  Use "have_dlopen" to check if we "have udf"
mysql-test/r/have_udf.require:
  Use "have_dlopen" to check if we "have udf"
mysql-test/r/udf.result:
  Update for new error message "function"->"symbol"
sql/item_func.cc:
  Remove "evil" dbug printour that checks args[0] even if arg_count is 0
sql/mysql_priv.h:
  Add "have_dlopen"
sql/mysqld.cc:
  Add "have_dlopen"
  Move HAVE_DLOPEN defined to only surround "udf_free" and "udf_init"
sql/set_var.cc:
  Add "have_dlopen"
sql/sql_plugin.cc:
  Surround 'dlclose' with HAVE_DLOPEN
sql/sql_udf.cc:
  Remove the requirement to load udf's only from "opt_plugin_dir".
  Fix spelling error
2006-03-21 10:54:26 +01:00
unknown
c7f8c632eb Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2006-03-20 21:41:27 +01:00
unknown
b1aacfac72 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/Makefile.am:
  Merge
sql/share/errmsg.txt:
  Merge
sql/sql_udf.cc:
  Merge
2006-03-20 20:16:53 +01:00
unknown
83bc8c4e38 Bug#17374: select ... like 'A%' operator fails to find value on columuns with key
Fixed that LIKE worked case insensitively for latin2_czech_cs,
which was wrong for a case sensitive collation.


include/m_ctype.h:
  Making my_wildcmp_bin public instead of static
strings/ctype-bin.c:
  Making my_wildcmp_bin public instead of static
strings/ctype-czech.c:
  Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit
mysql-test/include/have_latin2_ch.inc:
  New BitKeeper file ``mysql-test/include/have_latin2_ch.inc''
mysql-test/r/ctype_latin2_ch.result:
  New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result''
mysql-test/r/have_latin2_ch.require:
  New BitKeeper file ``mysql-test/r/have_latin2_ch.require''
mysql-test/t/ctype_latin2_ch.test:
  New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''
2006-03-20 16:28:25 +04:00
unknown
35e5d241e8 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats


configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_ndb_blob.result:
  Merge
mysql-test/t/disabled.def:
  Merge
mysql-test/t/rpl_ndb_blob.test:
  Merge
2006-03-10 10:21:41 +01:00
unknown
b5fdd2010e Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-03-09 17:15:40 +01:00
unknown
5d85c84310 Test fixes
mysql-test/include/show_binlog_events.inc:
  Mask table id from binlog output
mysql-test/t/ndb_binlog_ddl_multi.test:
  Use show_binlog_events.inc file
2006-03-09 16:30:59 +01:00
unknown
4c4aea2dd6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats


mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
  Fix of merge conflict
2006-03-09 16:12:58 +01:00
unknown
a3b0720bf0 New test to satisfy some of the 5.1 CR test plan
mysql-test/t/rpl_ndb_dd_advance.test:
  New test case to test advance use of Cluster Disk Data and replication
mysql-test/include/ndb_restore_slave_eoption.inc:
  New support file to help test advance use of Cluster Disk Data and replication
mysql-test/r/rpl_ndb_dd_advance.result:
  New result file for test of advance use of Cluster Disk Data and replication
2006-03-09 03:37:25 +01:00
unknown
1f3825b240 Bug #17838 binlog not setup on seconday master after rename
-added setting up of binlogging after receiving rename table
+cleanup


mysql-test/r/ndb_binlog_ddl_multi.result:
  Bug #17838 binlog not setup on seconday master after rename
mysql-test/t/ndb_binlog_ddl_multi.test:
  Bug #17838 binlog not setup on seconday master after rename
mysql-test/include/show_binlog_events.inc:
  New BitKeeper file ``mysql-test/include/show_binlog_events.inc''
2006-03-09 01:04:13 +01:00
unknown
40e371d2b6 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
mysql-test/r/rpl_row_create_table.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
2006-03-07 10:00:13 +01:00
unknown
88841e3c85 Bug#17728 tests that fails are: ndb_gis rpl_ndb_multi_update2
- Fix for ndb_gis to run with all types of logging


mysql-test/include/gis_generic.inc:
  Make the test tables for gis have a primary key with auto increment
mysql-test/r/archive_gis.result:
  Update test result
mysql-test/r/bdb_gis.result:
  Update test result
mysql-test/r/innodb_gis.result:
  Update test result
mysql-test/r/ndb_gis.result:
  Update test result
mysql-test/t/ndb_gis.test:
  Remove the requirement to only run thiswhen binlog format is row.
2006-03-03 11:52:52 +01:00
unknown
ac2b587029 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/r/binlog_row_insert_select.result:
  Auto merged
mysql-test/r/rpl_row_basic_11bugs.result:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/Makefile.am:
  Merging with mysql-5.1-new
mysql-test/r/binlog_row_ctype_cp932.result:
  Merging with mysql-5.1-new
mysql-test/r/rpl_ndb_blob.result:
  Merging with mysql-5.1-new
mysql-test/r/rpl_ndb_dd_basic.result:
  Merging with mysql-5.1-new
2006-03-03 09:57:42 +01:00
unknown
3addd306a6 Merge
configure.in:
  Auto merged
client/mysqlimport.c:
  Auto merged
include/config-win.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  SCCS merged
2006-02-28 23:29:58 +01:00
unknown
c6d8d3ea9a Updated new tests from Lars review
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
  Updated from review comments
mysql-test/include/rpl_multi_engine3.inc:
  Updated from review comments
2006-02-28 16:14:46 +01:00
unknown
4e31551b92 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
BitKeeper/deleted/.del-sp_notembedded.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
2006-02-28 10:06:58 +01:00
unknown
f8bc9b3cfd New test case fro replication between ndb and other storage engines.
mysql-test/t/rpl_ndb_2innodb.test:
  New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2myisam.test:
  New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2innodb-slave.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2innodb-master.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-master.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-slave.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb.test:
  New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_myisam2ndb.test:
  New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-master.opt:
  New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
  New rpl ndb test supporting option files
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
  New test code that drives the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/include/rpl_multi_engine3.inc:
  New include that cover repeating code of the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/t/disabled.def:
  Updated to include new test cases that have outstanding bug reports.
2006-02-27 15:09:03 +01:00
unknown
8ead0fe655 example.vcproj:
Bug#17721, hang in exampledb, solved by msvensson
drop-on-restart.inc:
  Added drop of tables t00,t03,t04


mysql-test/include/drop-on-restart.inc:
  Added drop of tables t00,t03,t04
VC++Files/storage/example/example.vcproj:
  Bug#17721, hang in exampledb, solved by msvensson
2006-02-27 02:56:34 +01:00
unknown
0d97c20ec0 drop-on-restart.inc:
Drop 'mysqlslap'
  Added database name 'ndbsynctest'
sql_table.cc, create.test, create.result:
  Patch for bug#17530 done by evgen, extracted from 5.0


mysql-test/r/create.result:
  Patch for bug#17530 done by evgen, extracted from 5.0
mysql-test/t/create.test:
  Patch for bug#17530 done by evgen, extracted from 5.0
sql/sql_table.cc:
  Patch for bug#17530 done by evgen, extracted from 5.0
mysql-test/include/drop-on-restart.inc:
  Drop 'mysqlslap'
2006-02-25 20:17:07 +01:00
unknown
d11aa8345d Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/bk/w3023-mysql-5.1-new


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  Auto merged
mysql-test/r/binlog_row_insert_select.result:
  Auto merged
mysql-test/r/rpl_row_delayed_ins.result:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/rpl_ndb_dd_basic.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_basic_11bugs.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_basic_2myisam.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_basic_3innodb.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_create_table.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_log.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_log_innodb.result:
  Merge with 5.1.7 release clone.
mysql-test/r/rpl_row_sp008.result:
  Merge with 5.1.7 release clone.
mysql-test/t/rpl_row_basic_11bugs.test:
  Merge with 5.1.7 release clone.
mysql-test/t/rpl_row_sp008.test:
  Merge with 5.1.7 release clone.
2006-02-24 16:31:38 +01:00
unknown
613fb54f95 WL#3023 (RBR: Use locks in a statement-like manner):
Adaptions to make it work with NDB.


mysql-test/extra/binlog_tests/binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/blackhole.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_log.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Using replace_regex to remove table id.
mysql-test/include/rpl_row_basic.inc:
  Removing sync with master on cleanup since there are engines that does
  not work in a "syncronized" fashion on dropping tables.
mysql-test/r/binlog_row_binlog.result:
  Result change
mysql-test/r/binlog_row_blackhole.result:
  Result change
mysql-test/r/binlog_row_ctype_cp932.result:
  Result change
mysql-test/r/binlog_row_ctype_ucs.result:
  Result change
mysql-test/r/binlog_row_insert_select.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_row.result:
  Result change
mysql-test/r/rpl_row_basic_11bugs.result:
  Result change
mysql-test/r/rpl_row_basic_2myisam.result:
  Result change
mysql-test/r/rpl_row_basic_3innodb.result:
  Result change
mysql-test/r/rpl_row_charset.result:
  Result change
mysql-test/r/rpl_row_create_table.result:
  Result change
mysql-test/r/rpl_row_delayed_ins.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_max_relay_size.result:
  Result change
mysql-test/r/rpl_row_sp008.result:
  Result change
mysql-test/t/binlog_stm_binlog.test:
  Using replace_regex to remove table id.
mysql-test/t/ndb_binlog_ddl_multi.test:
  Using replace_regex to remove table id.
mysql-test/t/ndb_binlog_ignore_db.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_heap.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_loaddata_s.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_ndb_blob.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_ndb_disk.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_basic_11bugs.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_create_table.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_drop.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_sp008.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_sp.test:
  Using replace_regex to remove table id.
mysql-test/t/sp.test:
  Using replace_regex to remove table id.
mysql-test/t/sp_notembedded.test:
  Using replace_regex to remove table id.
mysql-test/t/user_var-binlog.test:
  Using replace_regex to remove table id.
sql/ha_ndbcluster_binlog.cc:
  Assign_new_table_id() now takes table share.
  Removed gratuitous friend declaration of ndb_add_binlog_index().
  Turning of binlogging during execution of ndb_add_binlog_index().
sql/handler.h:
  Removed gratuitous friend declaration of ndb_add_binlog_index().
sql/log.cc:
  Adding debug printout.
sql/log_event.cc:
  Closing thread tables on dummy event.
sql/rpl_injector.cc:
  Added support for new locking scheme.
sql/rpl_injector.h:
  Added support for new locking scheme.
2006-02-24 16:19:55 +01:00
unknown
a71fb6407f Fix test cases to work with non-standard --vardir.
Rename mix_innodb_myisam_binlog-master.opt; when the test was moved to
separate stm/row test cases, the .opt were not moved along with it,
causing a 60-second test duration because of default lock timeout :-(


mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
  bk cp mysql-test/t/mix_innodb_myisam_binlog-master.opt mysql-test/t/binlog_row_mix_innodb_myisam-master.opt
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  Rename: mysql-test/t/mix_innodb_myisam_binlog-master.opt -> mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt
mysql-test/r/mysqlbinlog_base64.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_load.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_LD_INFILE.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata2.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loaddata_m.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/loaddata.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/mysqlbinlog_base64.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_dd_dump.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/ndb_load.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_LD_INFILE.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata2.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loaddata_m.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_loadfile.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_load_table_from_master.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_loadfile.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_row_001.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_001.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_loaddata_m.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_row_stop_middle_update.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_drop_db.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_load_table_from_master.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_stop_middle_update.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_func003.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/ndb_backup.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_bank.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/rpl_ndb_sync.result:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_bank.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_ndb_sync.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_NOW.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_func002.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_sp011.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig001.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_row_trig003.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/rpl_sp004.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/t/show_check.test:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_1.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/include/partition_layout.inc:
  Fix test cases to work with non-standard --vardir.
mysql-test/r/ndb_dd_backuprestore.result:
  Fix test cases to work with non-standard --vardir.
2006-02-22 10:07:54 +01:00
unknown
8cab8c82c8 mysql-test-run.pl:
Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>


client/mysqltest.c:
  Added option --include=<sql-file>
mysql-test/include/drop-on-restart.inc:
  DROP commands to cleanup on restart
mysql-test/mysql-test-run.pl:
  Added --restart-cleanup option
2006-02-20 00:32:07 +01:00
unknown
14a4824194 Test updates
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
  corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
  corrected issues with using cygwin to create
2006-02-16 16:33:46 +01:00
unknown
b4e7b365b5 Updates from review
mysql-test/include/ndb_backup.inc:
  We are writting test cases that use the ndb backup. This new include contains all the code needed to start the backup and grab the backup ID for the test. By moving the code here it will be easy to reuse
mysql-test/include/ndb_restore_master.inc:
  We are writting test cases that use the ndb backup and restore. This new include contains all the code needed to restore a master cluster from the backup done with ndb_backup.inc. By moving the code here it will be easy to reuse
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
2006-02-16 14:24:47 +01:00
unknown
79258e4480 Bug#17261 Passing a variable from a stored procedure to UDF crashes mysqld
- Pass "buffers[i]" to val_str() in udf_handler::fix_fields insteead of NULL.
 - Add testcase for UDF that will load and run the udf_example functions 
   if available


sql/item_func.cc:
  Instead of passing a NULL pointer into val_str, use the "buffers" array to provide a temp string buffer.
sql/udf_example.cc:
  Spelling error"on"->"one"
mysql-test/include/have_udf.inc:
  New BitKeeper file ``mysql-test/include/have_udf.inc''
mysql-test/r/have_udf.require:
  New BitKeeper file ``mysql-test/r/have_udf.require''
mysql-test/r/udf.result:
  New BitKeeper file ``mysql-test/r/udf.result''
mysql-test/t/udf.test:
  New BitKeeper file ``mysql-test/t/udf.test''
2006-02-15 17:11:24 +01:00
unknown
5e11016e87 Updated test cases
mysql-test/include/not_ndb_default.inc:
  New include file to skip certain tests with default engine = ndb
mysql-test/t/rpl_optimize.test:
  Updated to skip test when NDB is default engine
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
  Updated to skip test when NDB is default engine
BitKeeper/deleted/.del-rpl_ndb_auto_inc-master.opt~e38255d94debc2c8:
  Delete: mysql-test/t/rpl_ndb_auto_inc-master.opt
mysql-test/t/rpl_ndb_auto_inc.test:
  updated to use with ndb
mysql-test/r/rpl_ndb_auto_inc.result:
  New results
mysql-test/t/disabled.def:
  Updated to remove rpl_ndb_auto_inc.test
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  updated to remove check table, not needed and not supported by ndb engine
mysql-test/t/rpl_ndb_blob2.test:
  new ndb wrapper
mysql-test/r/rpl_ndb_blob2.result:
  new results
2006-02-13 16:36:11 +01:00
unknown
d942f408bc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
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
2006-02-07 18:04:50 +01:00
unknown
0522905ac3 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
2006-02-07 17:57:26 +01:00
unknown
3b80043296 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
2006-02-07 17:20:50 +01:00