From bd7fccb0fd760867a012153ea50854065af9a432 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 11 May 2006 18:12:06 +0200 Subject: [PATCH 1/2] changes for when NDB is default engine mysql-test/t/rpl_sp004.test: updated to work with default NDB engine mysql-test/r/rpl_sp004.result: updated to work with default NDB engine mysql-test/extra/rpl_tests/rpl_flsh_tbls.test: Updated to skip when ndb is default mysql-test/t/rpl_multi_engine.test: Results will not match when ndb is default do to myisam table creates and show create mysql-test/t/rpl_row_basic_11bugs.test: Disables for when ndb is default as the show binlog events will cause failure --- mysql-test/extra/rpl_tests/rpl_flsh_tbls.test | 4 ++++ mysql-test/r/rpl_sp004.result | 16 ++++++++-------- mysql-test/t/rpl_multi_engine.test | 3 +++ mysql-test/t/rpl_row_basic_11bugs.test | 4 ++++ mysql-test/t/rpl_sp004.test | 16 ++++++++-------- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test index cfa943228fa..8406c10af9b 100644 --- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test +++ b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test @@ -3,6 +3,10 @@ # RENAME TABLE work with MERGE tables on the slave. # Test of FLUSH NO_WRITE_TO_BINLOG by the way. # + +# Merge will not work with a default ndb engine +-- source include/not_ndb_default.inc + -- source include/master-slave.inc create table t1 (a int); diff --git a/mysql-test/r/rpl_sp004.result b/mysql-test/r/rpl_sp004.result index dfc672d4cd7..1c0ed3cc50a 100644 --- a/mysql-test/r/rpl_sp004.result +++ b/mysql-test/r/rpl_sp004.result @@ -26,25 +26,25 @@ DROP TABLE IF EXISTS test.t2; INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW()); END| CALL test.p1(); -SELECT * FROM test.t1; +SELECT * FROM test.t1 ORDER BY a; a 1 2 3 12 -SELECT * FROM test.t2; +SELECT * FROM test.t2 ORDER BY a; a 1 2 3 8 -SELECT * FROM test.t1; +SELECT * FROM test.t1 ORDER BY a; a 1 2 3 12 -SELECT * FROM test.t2; +SELECT * FROM test.t2 ORDER BY a; a 1 2 @@ -62,25 +62,25 @@ t3 CALL test.p1(); Warnings: Note 1050 Table 't3' already exists -SELECT * FROM test.t1; +SELECT * FROM test.t1 ORDER BY a; a 1 2 3 12 -SELECT * FROM test.t2; +SELECT * FROM test.t2 ORDER BY a; a 1 2 3 8 -SELECT * FROM test.t1; +SELECT * FROM test.t1 ORDER BY a; a 1 2 3 12 -SELECT * FROM test.t2; +SELECT * FROM test.t2 ORDER BY a; a 1 2 diff --git a/mysql-test/t/rpl_multi_engine.test b/mysql-test/t/rpl_multi_engine.test index 3f7b7b11c0d..9ebbdfe27de 100644 --- a/mysql-test/t/rpl_multi_engine.test +++ b/mysql-test/t/rpl_multi_engine.test @@ -1,5 +1,8 @@ # See if replication between MyISAM, MEMORY and InnoDB works. +# Results files do not match when ndb is default +-- source include/not_ndb_default.inc + -- source include/master-slave.inc connection slave; diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test index d098723644f..f0a66acc681 100644 --- a/mysql-test/t/rpl_row_basic_11bugs.test +++ b/mysql-test/t/rpl_row_basic_11bugs.test @@ -1,5 +1,9 @@ --source include/have_row_based.inc --source include/have_binlog_format_row.inc + +# Show binlog events will cause failure when ndb is default +-- source include/not_ndb_default.inc + --source include/master-slave.inc # Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table diff --git a/mysql-test/t/rpl_sp004.test b/mysql-test/t/rpl_sp004.test index 335a17c7af0..055a13cc157 100644 --- a/mysql-test/t/rpl_sp004.test +++ b/mysql-test/t/rpl_sp004.test @@ -44,13 +44,13 @@ END| delimiter ;| CALL test.p1(); -SELECT * FROM test.t1; -SELECT * FROM test.t2; +SELECT * FROM test.t1 ORDER BY a; +SELECT * FROM test.t2 ORDER BY a; save_master_pos; connection slave; sync_with_master; -SELECT * FROM test.t1; -SELECT * FROM test.t2; +SELECT * FROM test.t1 ORDER BY a; +SELECT * FROM test.t2 ORDER BY a; connection master; CALL test.p2(); @@ -66,14 +66,14 @@ SHOW TABLES; connection master; CALL test.p1(); -SELECT * FROM test.t1; -SELECT * FROM test.t2; +SELECT * FROM test.t1 ORDER BY a; +SELECT * FROM test.t2 ORDER BY a; #SELECT * FROM test.t3; save_master_pos; connection slave; sync_with_master; -SELECT * FROM test.t1; -SELECT * FROM test.t2; +SELECT * FROM test.t1 ORDER BY a; +SELECT * FROM test.t2 ORDER BY a; #SELECT * FROM test.t3; --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql From 07f3ca8ccef5262ab65b7bdf0ac56ad4d8dc1052 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 May 2006 14:09:13 +0200 Subject: [PATCH 2/2] rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: Updated per lars rpl_row_flsh_tbls.test: updated per lars mysql-test/extra/rpl_tests/rpl_flsh_tbls.test: Updated per lars mysql-test/t/rpl_row_flsh_tbls.test: updated per lars mysql-test/t/rpl_multi_engine.test: Updated per lars mysql-test/t/rpl_row_basic_11bugs.test: Updated per lars --- mysql-test/extra/rpl_tests/rpl_flsh_tbls.test | 2 -- mysql-test/t/rpl_multi_engine.test | 3 ++- mysql-test/t/rpl_row_basic_11bugs.test | 4 +++- mysql-test/t/rpl_row_flsh_tbls.test | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test index 8406c10af9b..7a097fd1eae 100644 --- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test +++ b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test @@ -4,8 +4,6 @@ # Test of FLUSH NO_WRITE_TO_BINLOG by the way. # -# Merge will not work with a default ndb engine --- source include/not_ndb_default.inc -- source include/master-slave.inc diff --git a/mysql-test/t/rpl_multi_engine.test b/mysql-test/t/rpl_multi_engine.test index 9ebbdfe27de..10780c765f7 100644 --- a/mysql-test/t/rpl_multi_engine.test +++ b/mysql-test/t/rpl_multi_engine.test @@ -1,6 +1,7 @@ # See if replication between MyISAM, MEMORY and InnoDB works. -# Results files do not match when ndb is default +#This test case is not written for NDB, result files do not +#match when NDB is the default engine -- source include/not_ndb_default.inc -- source include/master-slave.inc diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test index f0a66acc681..3a686ea6b3d 100644 --- a/mysql-test/t/rpl_row_basic_11bugs.test +++ b/mysql-test/t/rpl_row_basic_11bugs.test @@ -1,7 +1,9 @@ --source include/have_row_based.inc --source include/have_binlog_format_row.inc -# Show binlog events will cause failure when ndb is default + +#This test case is not written for NDB, the result files +#will not match when NDB is the default engine -- source include/not_ndb_default.inc --source include/master-slave.inc diff --git a/mysql-test/t/rpl_row_flsh_tbls.test b/mysql-test/t/rpl_row_flsh_tbls.test index 1a81da39896..9e8efc1ac9c 100644 --- a/mysql-test/t/rpl_row_flsh_tbls.test +++ b/mysql-test/t/rpl_row_flsh_tbls.test @@ -6,6 +6,11 @@ let $rename_event_pos= 615; # Bug#18326: Do not lock table for writing during prepare of statement # The use of the ps protocol causes extra table maps in the binlog, so # we disable the ps-protocol for this statement. + +# Merge tables are not supported in NDB +-- source include/not_ndb_default.inc + + --disable_ps_protocol -- source extra/rpl_tests/rpl_flsh_tbls.test --enable_ps_protocol