Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2025-07-29 05:21:33 +03:00 · 2007-09-12 13:55:45 +02:00
parent c0f5b574f4 9620892508
commit 63648db422
60 changed files with 1582 additions and 169 deletions
--- a/mysql-test/include/ndb_master-slave.inc
+++ b/mysql-test/include/ndb_master-slave.inc
@ -1,3 +1,6 @@
+# Replication tests need binlog
+source include/have_log_bin.inc;
+
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
--- a/mysql-test/suite/ndb/t/disabled.def
+++ b/mysql-test/suite/ndb/t/disabled.def
@ -9,8 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
-ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_dd_sql_features      : Bug#29102 ndb_dd_sql_features fails in pushbuild
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

@ -21,5 +19,3 @@ ndb_partition_error2	 : HF is not sure if the test can work as internded on all
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
 #ndb_binlog_discover      : bug#21806 2006-08-24
-#ndb_autodiscover3        : bug#21806
-#ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages
--- a/mysql-test/suite/ndb_team/r/ndb_autodiscover.result
+++ b/mysql-test/suite/ndb_team/r/ndb_autodiscover.result
--- a/mysql-test/suite/ndb_team/r/ndb_autodiscover2.result
+++ b/mysql-test/suite/ndb_team/r/ndb_autodiscover2.result
--- a/mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
+++ b/mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
--- a/mysql-test/suite/ndb_team/t/disabled.def
+++ b/mysql-test/suite/ndb_team/t/disabled.def
@ -0,0 +1,17 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
+ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
+
+# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
+#ndb_autodiscover3        : bug#21806
+#ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover.test
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover.test
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover2.test
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover2.test
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
--- a/mysql-test/suite/rpl_ndb/t/disabled.def
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def
@ -13,6 +13,7 @@

 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
+rpl_ndb_2other           : BUG#21842 2007-08-30 tsmith test has never worked on bigendian (sol10-sparc-a, powermacg5
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
 rpl_ndb_innodb2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
 rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
@ -7,7 +7,7 @@
 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed_or_row.inc
--source include/master-slave.inc
+--source include/ndb_master-slave.inc

 # On master use NDB as storage engine.
 connection master;
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc


--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test
@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc

 #
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
@ -4,7 +4,6 @@
 # code between engine tests     #
 #################################
 -- source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_blob.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc

 # set up circular replication
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
@ -1,5 +1,4 @@
 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc

 connection master;
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
@ -6,6 +6,5 @@
 #####################################
 -- source include/have_ndb.inc
 -- source include/ndb_master-slave.inc
-- source include/have_log_bin.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_commit_after_flush.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
@ -3,7 +3,6 @@
 # Share test code between engine tests  #
 #########################################
 --source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_delete_no_where.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test
@ -6,7 +6,6 @@
 ##########################################################

 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc

 --disable_warnings
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test
@ -6,7 +6,6 @@
 ##########################################################

 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc

 --disable_warnings
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
@ -7,7 +7,6 @@
 # reduce test case code           #
 ###################################
 -- source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test
@ -3,7 +3,6 @@
 -- source include/have_ndb.inc
 -- source include/have_innodb.inc
 -- source include/ndb_master-slave.inc
-- source include/have_log_bin.inc

 create table t1 (a int, unique(a)) engine=ndbcluster;
 create table t2 (a int, unique(a)) engine=innodb;
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
@ -2,7 +2,6 @@
 # Wrapper for rpl_insert_ignore.test#
 #####################################
 -- source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 let $engine_type2=myisam;
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
@ -3,7 +3,6 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_multi_update3.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test
@ -7,7 +7,6 @@
 ##########################################################

 --source include/have_ndb.inc
--source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_master-slave.inc

 --disable_warnings
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
@ -2,7 +2,6 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_001.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
@ -5,7 +5,6 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp003.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
@ -5,7 +5,6 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp006.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
@ -7,7 +7,6 @@
 #############################################################################

 # Includes
-- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndb.inc
 -- source include/ndb_master-slave.inc
 let $engine_type=NDB;