From 7b081501cbaa76d4feeee433f89164111fcb5cea Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Jun 2007 15:36:10 +0200 Subject: fixes Bug #25305 (and several other similar test tailures with the same symptom) - make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_commit_after_flush.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_delete_no_where.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_insert_ignore.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_log.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_multi_update2.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_multi_update3.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_relayrotate.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_001.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_UUID.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_basic.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_blob.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_charset.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_func003.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_sp003.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_sp006.test: make tests wait until ndb connects properly mysql-test/include/have_multi_ndb.inc: make tests wait until ndb connects properly mysql-test/include/have_ndb.inc: make tests wait until ndb connects properly mysql-test/include/ndb_not_readonly.inc: make tests wait until ndb connects properly mysql-test/t/rpl_commit_after_flush.test: make tests wait until ndb connects properly mysql-test/t/rpl_delete_no_where.test: make tests wait until ndb connects properly mysql-test/t/rpl_insert_ignore.test: make tests wait until ndb connects properly mysql-test/t/rpl_multi_update2.test: make tests wait until ndb connects properly mysql-test/t/rpl_multi_update3.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_2innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_2myisam.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_UUID.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_auto_inc.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_bank.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_basic.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_blob.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_blob2.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_charset.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_circular.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_circular_simplex.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_commit_afterflush.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_dd_advance.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_dd_basic.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_dd_partitions.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_ddl.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_delete_nowhere.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_do_db.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_do_table.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_extraCol.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_func003.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_idempotent.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_innodb2ndb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_innodb_trans.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_insert_ignore.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_load.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_log.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_multi.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_multi_update2.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_multi_update3.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_myisam2ndb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_relayrotate.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_rep_ignore.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_row_001.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_sp003.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_sp006.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_stm_innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_sync.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_trig004.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndbapi_multi.test: make tests wait until ndb connects properly mysql-test/t/rpl_relayrotate.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_001.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_UUID.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_basic_2myisam.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_basic_3innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_basic_7ndb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_blob_innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_blob_myisam.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_charset.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_func003.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_log.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_log_innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_sp003.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_sp006_InnoDB.test: make tests wait until ndb connects properly mysql-test/t/rpl_stm_log.test: make tests wait until ndb connects properly mysql-test/t/rpl_truncate_7ndb.test: make tests wait until ndb connects properly mysql-test/include/ndb_master-slave.inc: New BitKeeper file ``mysql-test/include/ndb_master-slave.inc'' --- mysql-test/extra/rpl_tests/rpl_commit_after_flush.test | 2 -- mysql-test/extra/rpl_tests/rpl_delete_no_where.test | 2 -- mysql-test/extra/rpl_tests/rpl_insert_ignore.test | 2 -- mysql-test/extra/rpl_tests/rpl_log.test | 1 - mysql-test/extra/rpl_tests/rpl_multi_update2.test | 2 -- mysql-test/extra/rpl_tests/rpl_multi_update3.test | 2 -- mysql-test/extra/rpl_tests/rpl_relayrotate.test | 2 -- mysql-test/extra/rpl_tests/rpl_row_001.test | 3 --- mysql-test/extra/rpl_tests/rpl_row_UUID.test | 4 ---- mysql-test/extra/rpl_tests/rpl_row_basic.test | 3 --- mysql-test/extra/rpl_tests/rpl_row_blob.test | 4 ---- mysql-test/extra/rpl_tests/rpl_row_charset.test | 4 ---- mysql-test/extra/rpl_tests/rpl_row_func003.test | 5 ----- mysql-test/extra/rpl_tests/rpl_row_sp003.test | 5 ----- mysql-test/extra/rpl_tests/rpl_row_sp006.test | 4 ---- 15 files changed, 45 deletions(-) (limited to 'mysql-test/extra') diff --git a/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test b/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test index d63d7e4b07d..98638b0b1f6 100644 --- a/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test +++ b/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test @@ -2,8 +2,6 @@ # Test updated to use a wrapper # ################################# --- source include/master-slave.inc - eval CREATE TABLE t1 (a INT) ENGINE=$engine_type; begin; diff --git a/mysql-test/extra/rpl_tests/rpl_delete_no_where.test b/mysql-test/extra/rpl_tests/rpl_delete_no_where.test index 4db9e0fb63f..914bedc6b67 100644 --- a/mysql-test/extra/rpl_tests/rpl_delete_no_where.test +++ b/mysql-test/extra/rpl_tests/rpl_delete_no_where.test @@ -2,8 +2,6 @@ # (not internally row-per-row but more like a TRUNCATE, MyISAM # supports that), is replicated (BUG#13576). --- source include/master-slave.inc - eval create table t1 (a int, b int) engine=$engine_type; insert into t1 values(1,1); sync_slave_with_master; diff --git a/mysql-test/extra/rpl_tests/rpl_insert_ignore.test b/mysql-test/extra/rpl_tests/rpl_insert_ignore.test index 207b53b6fb4..43d45ef6c60 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_ignore.test +++ b/mysql-test/extra/rpl_tests/rpl_insert_ignore.test @@ -5,8 +5,6 @@ # Slave needs to be started with --innodb to store table in InnoDB. # Same test for MyISAM (which had no bug). --- source include/master-slave.inc - eval CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned, diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index 932fcdf670b..b3a0b513705 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -1,5 +1,4 @@ # Requires statement logging --- source include/master-slave.inc # Clean up old slave's binlogs. # The slave is started with --log-slave-updates diff --git a/mysql-test/extra/rpl_tests/rpl_multi_update2.test b/mysql-test/extra/rpl_tests/rpl_multi_update2.test index 0adf0053425..ae4261c0516 100644 --- a/mysql-test/extra/rpl_tests/rpl_multi_update2.test +++ b/mysql-test/extra/rpl_tests/rpl_multi_update2.test @@ -2,8 +2,6 @@ # some replicate-* rules exist. # (BUG#7011) -source include/master-slave.inc; - --disable_warnings drop table if exists t1,t2; --enable_warnings diff --git a/mysql-test/extra/rpl_tests/rpl_multi_update3.test b/mysql-test/extra/rpl_tests/rpl_multi_update3.test index 797e385e509..6c7a980aecb 100644 --- a/mysql-test/extra/rpl_tests/rpl_multi_update3.test +++ b/mysql-test/extra/rpl_tests/rpl_multi_update3.test @@ -1,5 +1,3 @@ --- source include/master-slave.inc - ############################################################################## # # Let's verify that multi-update with a subselect does not cause the slave to crash diff --git a/mysql-test/extra/rpl_tests/rpl_relayrotate.test b/mysql-test/extra/rpl_tests/rpl_relayrotate.test index 0d2f25e2b4a..28670fe0985 100644 --- a/mysql-test/extra/rpl_tests/rpl_relayrotate.test +++ b/mysql-test/extra/rpl_tests/rpl_relayrotate.test @@ -8,8 +8,6 @@ # The slave is started with max_binlog_size=16384 bytes, # to force many rotations (approximately 30 rotations) --- source include/master-slave.inc - # We have to sync with master, to ensure slave had time to start properly # before we stop it. If not, we get errors about UNIX_TIMESTAMP() in the log. connection master; diff --git a/mysql-test/extra/rpl_tests/rpl_row_001.test b/mysql-test/extra/rpl_tests/rpl_row_001.test index 9bdfae81093..6261659c4ce 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_001.test +++ b/mysql-test/extra/rpl_tests/rpl_row_001.test @@ -1,6 +1,3 @@ --- source include/master-slave.inc --- source include/have_binlog_format_row.inc - CREATE TABLE t1 (word CHAR(20) NOT NULL); LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR diff --git a/mysql-test/extra/rpl_tests/rpl_row_UUID.test b/mysql-test/extra/rpl_tests/rpl_row_UUID.test index b3fa2fabe2c..ee2a29ac938 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_UUID.test +++ b/mysql-test/extra/rpl_tests/rpl_row_UUID.test @@ -5,10 +5,6 @@ # TEST: To test the UUID() in rbr # ############################################################################# -# Includes --- source include/have_binlog_format_row.inc --- source include/master-slave.inc - # Begin clean up test section connection master; diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test index 9ba06096faf..27740afd587 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test @@ -1,6 +1,3 @@ ---source include/have_binlog_format_row.inc ---source include/master-slave.inc - # # Basic tests of row-level logging # diff --git a/mysql-test/extra/rpl_tests/rpl_row_blob.test b/mysql-test/extra/rpl_tests/rpl_row_blob.test index 2dc6867df32..080df7d75dd 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_blob.test +++ b/mysql-test/extra/rpl_tests/rpl_row_blob.test @@ -5,10 +5,6 @@ # correctly. ################################################ -# Includes --- source include/have_binlog_format_row.inc --- source include/master-slave.inc - # Pre test clean up section connection master; --disable_warnings diff --git a/mysql-test/extra/rpl_tests/rpl_row_charset.test b/mysql-test/extra/rpl_tests/rpl_row_charset.test index 4ce5245a79a..a21ed5bb841 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_charset.test +++ b/mysql-test/extra/rpl_tests/rpl_row_charset.test @@ -1,10 +1,6 @@ # Replication of character sets. # This test will fail if the server/client does not support enough charsets. -# Requires statement logging --- source include/have_binlog_format_row.inc - --- source include/master-slave.inc --disable_warnings set timestamp=1000000000; drop database if exists mysqltest2; diff --git a/mysql-test/extra/rpl_tests/rpl_row_func003.test b/mysql-test/extra/rpl_tests/rpl_row_func003.test index 662f1454096..8ee2d863527 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_func003.test +++ b/mysql-test/extra/rpl_tests/rpl_row_func003.test @@ -18,11 +18,6 @@ # Vs slave. # ############################################################################# -# Includes --- source include/have_binlog_format_row.inc --- source include/master-slave.inc - - # Begin clean up test section connection master; --disable_warnings diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp003.test b/mysql-test/extra/rpl_tests/rpl_row_sp003.test index df318ee0c0b..7cf3d0fa19c 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp003.test +++ b/mysql-test/extra/rpl_tests/rpl_row_sp003.test @@ -3,11 +3,6 @@ # Original Date: Aug/13/2005 Created from Bug 12335 # ############################################################################# -# Includes --- source include/have_binlog_format_row.inc --- source include/master-slave.inc - - # Begin clean up test section connection master; --disable_warnings diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp006.test b/mysql-test/extra/rpl_tests/rpl_row_sp006.test index da9206d7d3f..897d7e492bf 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp006.test +++ b/mysql-test/extra/rpl_tests/rpl_row_sp006.test @@ -8,10 +8,6 @@ # to populate a table with data from the first table. # ############################################################################# -# Includes --- source include/have_binlog_format_row.inc --- source include/master-slave.inc - # Begin clean up test section connection master; --disable_warnings -- cgit v1.2.1