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,8 +2,6 @@
 # Test updated to use a wrapper #
 #################################
 
--- source include/master-slave.inc
-
 eval CREATE TABLE t1 (a INT) ENGINE=$engine_type;
 
 begin;

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;

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,

mysql-test/extra/rpl_tests/rpl_log.test

 # Requires statement logging
--- source include/master-slave.inc
 
 # Clean up old slave's binlogs.
 # The slave is started with --log-slave-updates

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

mysql-test/extra/rpl_tests/rpl_multi_update3.test

--- source include/master-slave.inc
-
 ##############################################################################
 #
 # Let's verify that multi-update with a subselect does not cause the slave to crash

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;

mysql-test/extra/rpl_tests/rpl_row_001.test

--- 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

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;
 

mysql-test/extra/rpl_tests/rpl_row_basic.test

---source include/have_binlog_format_row.inc
---source include/master-slave.inc
-
 #
 # Basic tests of row-level logging
 #

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

mysql-test/extra/rpl_tests/rpl_row_charset.test

 # 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;

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

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

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

mysql-test/include/have_multi_ndb.inc

@@ -11,6 +11,7 @@ drop table if exists t1, t2;
 flush tables;
 --require r/true.require
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
 enable_query_log;
 
 # Check that server2 has NDB support
@@ -22,11 +23,8 @@ drop table if exists t1, t2;
 flush tables;
 --require r/true.require
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
 enable_query_log;
 
-# Check should be here as well...
-# # Check that second master mysqld has come out of redonly mode
-# --source include/ndb_not_readonly.inc
-
 # Set the default connection to 'server1'
 connection server1;

mysql-test/include/have_ndb.inc

@@ -2,8 +2,5 @@
 disable_query_log;
 --require r/true.require
 select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
 enable_query_log;
-
-
-
-

mysql-test/include/ndb_master-slave.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,);
+connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
+
+connection slave;
+-- source include/have_ndb.inc
+
+-- source include/master-slave-reset.inc
+
+# Set the default connection to 'master'
+connection master;

mysql-test/include/ndb_not_readonly.inc

 # Check that server has come out ot readonly mode
---disable_query_log
-let $counter= 100;
+#
+# wait for server to connect properly to cluster
+#
+--error 0,ER_CHECK_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
+delete from mysql.ndb_apply_status where server_id=0;
 let $mysql_errno= 1;
+let $counter= 600;
 while ($mysql_errno)
 {
-  --error 0, 1005
-  create table check_read_only(a int) engine=NDB;
-  sleep 0.1;
-  if (!$counter)
+  # Table is readonly until the mysqld has connected properly
+  --error 0,ER_CHECK_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG
+  replace into mysql.ndb_apply_status values(0,0,"",0,0);
+  if ($mysql_errno)
   {
-    die("Failed while waiting for mysqld to come out of readonly mode");
+    if (!$counter)
+    {
+      die("Failed while waiting for mysqld to come out of readonly mode");
+    }
+    dec $counter;
+    --sleep 0.1
   }
-  dec $counter;
 }
-
-let $counter= 100;
-let $mysql_errno= 1;
-while ($mysql_errno)
-{
-  --error 0, 1036
-  insert into check_read_only values(1);
-  sleep 0.1;
-  if (!$counter)
-  {
-    die("Failed while waiting for mysqld to come out of readonly mode");
-  }
-  dec $counter;
-}
-drop table check_read_only;
---enable_query_log
+delete from mysql.ndb_apply_status where server_id=0;
+#
+# connected
+#

mysql-test/t/rpl_commit_after_flush.test

@@ -7,5 +7,6 @@
 ########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 let $engine_type=innodb;
 -- source extra/rpl_tests/rpl_commit_after_flush.test

mysql-test/t/rpl_delete_no_where.test

@@ -2,5 +2,6 @@
 # By JBM 2006-02-14 added to skip test when NDB   #
 ##################################################
 -- source include/not_ndb_default.inc
+-- source include/master-slave.inc
 let $engine_type=myisam;
 -- source extra/rpl_tests/rpl_delete_no_where.test

mysql-test/t/rpl_insert_ignore.test

@@ -3,6 +3,7 @@
 #####################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 let $engine_type=innodb;
 let $engine_type2=myisam;
 -- source extra/rpl_tests/rpl_insert_ignore.test

mysql-test/t/rpl_multi_update2.test

@@ -5,5 +5,6 @@
 # Default engine.                                     #
 #######################################################
 --source include/not_ndb_default.inc
+--source include/master-slave.inc
 let $engine_type=MyISAM;
 --source extra/rpl_tests/rpl_multi_update2.test

mysql-test/t/rpl_multi_update3.test

@@ -5,5 +5,6 @@
 # Default engine.                                     #
 #######################################################
 --source include/not_ndb_default.inc
+--source include/master-slave.inc
 let $engine_type=MyISAM;
 -- source extra/rpl_tests/rpl_multi_update3.test

mysql-test/t/rpl_ndb_2innodb.test

@@ -8,7 +8,7 @@
 # test and to have control over the tests.
 ##############################################################
 -- source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
 connection slave;
 -- source include/have_innodb.inc
 connection master;

mysql-test/t/rpl_ndb_2myisam.test

@@ -8,6 +8,6 @@
 # test and to have control over the tests.
 ##############################################################
 -- source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
 SET storage_engine=ndb;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test

mysql-test/t/rpl_ndb_UUID.test

@@ -2,5 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
+--source include/have_binlog_format_row.inc
+--source include/ndb_master-slave.inc
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_row_UUID.test

mysql-test/t/rpl_ndb_auto_inc.test

@@ -7,8 +7,8 @@
 # Change: Augmented test to use with cluster
 #####################################
 --source include/have_ndb.inc
---source include/master-slave.inc
 --source include/have_binlog_format_mixed_or_row.inc
+--source include/ndb_master-slave.inc
 
 --echo ***************** Test 1 ************************
 --echo

mysql-test/t/rpl_ndb_bank.test

@@ -13,7 +13,7 @@
 --source include/have_ndb.inc
 --source include/have_ndb_extra.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 # kill any trailing processes
 --system killall lt-bankTransactionMaker lt-bankTimer lt-bankMakeGL || true

mysql-test/t/rpl_ndb_basic.test

 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 
 

mysql-test/t/rpl_ndb_blob.test

 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #
 # basic test of blob replication for NDB

mysql-test/t/rpl_ndb_blob2.test

@@ -4,6 +4,8 @@
 # code between engine tests     #
 #################################
 -- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_blob.test
 

mysql-test/t/rpl_ndb_charset.test

@@ -2,5 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_charset.test

mysql-test/t/rpl_ndb_circular.test

 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 # set up circular replication
 

mysql-test/t/rpl_ndb_circular_simplex.test

 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 connection master;
 CREATE TABLE t1 (a int key, b int) ENGINE=NDB;

mysql-test/t/rpl_ndb_commit_afterflush.test

@@ -5,5 +5,6 @@
 # By JBM 2004-02-15                 #
 #####################################
 -- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_commit_after_flush.test

mysql-test/t/rpl_ndb_dd_advance.test

@@ -11,7 +11,7 @@
 --source include/not_embedded.inc
 --source include/big_test.inc
 #--source include/have_ndb_extra.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #### Test start cleanup section #####
 --disable_warnings

mysql-test/t/rpl_ndb_dd_basic.test

 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

mysql-test/t/rpl_ndb_dd_partitions.test

@@ -7,7 +7,7 @@
 
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --echo --- Doing pre test cleanup --- 
 

mysql-test/t/rpl_ndb_ddl.test

@@ -23,8 +23,8 @@
 #         abort of the test case etc..
 #
 
---source include/master-slave.inc
 --source include/have_ndb.inc
+--source include/ndb_master-slave.inc
 let $engine_type= NDB;
 let $temp_engine_type= MEMORY;
 let $show_binlog = 0;

mysql-test/t/rpl_ndb_delete_nowhere.test

@@ -4,5 +4,6 @@
 #########################################
 --source include/have_ndb.inc
 -- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_delete_no_where.test

mysql-test/t/rpl_ndb_do_db.test

@@ -7,7 +7,7 @@
 
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS replica;

mysql-test/t/rpl_ndb_do_table.test

@@ -7,7 +7,7 @@
 
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2;

mysql-test/t/rpl_ndb_extraCol.test

@@ -5,8 +5,8 @@
 #          Using NDB
 ########################################### 
 -- source include/have_binlog_format_row.inc
---source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
 let $engine_type = 'NDB';
 -- source extra/rpl_tests/rpl_extraSlave_Col.test
 

mysql-test/t/rpl_ndb_func003.test

@@ -7,6 +7,8 @@
 # reduce test case code           #
 ###################################
 -- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test
 -- source include/master-slave-end.inc

mysql-test/t/rpl_ndb_idempotent.test

 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #
 # Currently test only works with ndb since it retrieves "old"

mysql-test/t/rpl_ndb_innodb2ndb.test

@@ -7,10 +7,8 @@
 # to be able to use the same code for all these different
 # test and to have control over the tests.
 ##############################################################
--- source include/have_innodb.inc
--- source include/master-slave.inc
-connection slave;
 -- source include/have_ndb.inc
-connection master;
+-- source include/have_innodb.inc
+-- source include/ndb_master-slave.inc
 SET storage_engine=innodb;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test

mysql-test/t/rpl_ndb_innodb_trans.test

@@ -2,7 +2,7 @@
 
 -- source include/have_ndb.inc
 -- source include/have_innodb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
 
 create table t1 (a int, unique(a)) engine=ndbcluster;
 create table t2 (a int, unique(a)) engine=innodb;

mysql-test/t/rpl_ndb_insert_ignore.test

@@ -3,6 +3,7 @@
 #####################################
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 let $engine_type2=myisam;
 -- source extra/rpl_tests/rpl_insert_ignore.test

mysql-test/t/rpl_ndb_load.test

@@ -7,7 +7,7 @@
 --source include/have_ndb.inc
 --source include/have_ndb_extra.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --disable_warnings
 # reset master

mysql-test/t/rpl_ndb_log.test

@@ -7,6 +7,7 @@
 ###################################
 -- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_log.test
 

mysql-test/t/rpl_ndb_multi.test

---source include/have_ndb.inc
 --source include/have_multi_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 # note: server2 is another "master" connected to the master cluster
 

mysql-test/t/rpl_ndb_multi_update2.test

@@ -7,6 +7,7 @@
 # Run this only for row based replication, as replication of
 # auto_increment values are not supported with NDB as storage engine
 -- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_multi_update2.test

mysql-test/t/rpl_ndb_multi_update3.test

@@ -4,5 +4,6 @@
 ############################################################
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_multi_update3.test

mysql-test/t/rpl_ndb_myisam2ndb.test

@@ -7,9 +7,6 @@
 # to be able to use the same code for all these different
 # test and to have control over the tests.
 ##############################################################
--- source include/master-slave.inc
-connection slave;
---source include/have_ndb.inc
-connection master;
+-- source include/ndb_master-slave.inc
 SET storage_engine=myisam;
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test

mysql-test/t/rpl_ndb_relayrotate.test

@@ -4,5 +4,6 @@
 ############################################################
 -- source include/have_ndb.inc
 -- source include/have_ndb_extra.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_relayrotate.test

mysql-test/t/rpl_ndb_rep_ignore.test

@@ -8,7 +8,7 @@
 
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS replica;

mysql-test/t/rpl_ndb_row_001.test

@@ -2,5 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_001.test

mysql-test/t/rpl_ndb_sp003.test

@@ -5,5 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp003.test

mysql-test/t/rpl_ndb_sp006.test

@@ -5,5 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp006.test

mysql-test/t/rpl_ndb_stm_innodb.test

 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed_or_statement.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --connection master
 create table t1 (a int key, b int) engine innodb;

mysql-test/t/rpl_ndb_sync.test

@@ -2,7 +2,7 @@
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #
 # Currently test only works with ndb since it retrieves "old"

mysql-test/t/rpl_ndb_trig004.test

@@ -9,7 +9,7 @@
 # Includes
 -- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
--- source include/master-slave.inc
+-- source include/ndb_master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_trig004.test
 

mysql-test/t/rpl_ndbapi_multi.test

 -- source include/have_ndb.inc
 -- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
 -- source include/have_ndbapi_examples.inc
+-- source include/ndb_master-slave.inc
 
 --exec echo Running ndbapi_simple_dual
 --exec $NDB_EXAMPLES_DIR/ndbapi_simple_dual/ndbapi_simple_dual $MASTER_MYSOCK "localhost:$NDBCLUSTER_PORT" $SLAVE_MYSOCK "localhost:$NDBCLUSTER_PORT_SLAVE" >> $NDB_EXAMPLES_OUTPUT

mysql-test/t/rpl_relayrotate.test

@@ -6,5 +6,6 @@
 #######################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 let $engine_type=innodb;
 -- source extra/rpl_tests/rpl_relayrotate.test

mysql-test/t/rpl_row_001.test

@@ -3,5 +3,7 @@
 # Added to skip if ndb is default                      #
 ########################################################
 -- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=MYISAM;
 -- source extra/rpl_tests/rpl_row_001.test

mysql-test/t/rpl_row_UUID.test

@@ -3,5 +3,7 @@
 # Added to skip if ndb is default                      #
 ########################################################
 -- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=myisam;
 --source extra/rpl_tests/rpl_row_UUID.test

mysql-test/t/rpl_row_basic_2myisam.test

+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
+
 let $type= 'MYISAM' ;
 let $extra_index= ;
 -- source extra/rpl_tests/rpl_row_basic.test

mysql-test/t/rpl_row_basic_3innodb.test

 -- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 
 let $type= 'INNODB' ;
 let $extra_index= ;

mysql-test/t/rpl_row_basic_7ndb.test

 -- source include/have_ndb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/ndb_master-slave.inc
+
 let $type= 'NDB' ;
 let $extra_index= ;
 -- source extra/rpl_tests/rpl_row_basic.test

mysql-test/t/rpl_row_blob_innodb.test

@@ -7,6 +7,8 @@
 ########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=InnoDB;
 -- source extra/rpl_tests/rpl_row_blob.test
 

mysql-test/t/rpl_row_blob_myisam.test

@@ -6,6 +6,8 @@
 # Added to skip if ndb is default                      #
 ########################################################
 -- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=myisam;
 -- source extra/rpl_tests/rpl_row_blob.test
 

mysql-test/t/rpl_row_charset.test

@@ -3,5 +3,7 @@
 # Added to skip if ndb is default                      #
 ########################################################
 -- source include/not_ndb_default.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=myisam;
 -- source extra/rpl_tests/rpl_row_charset.test

mysql-test/t/rpl_row_func003.test

@@ -7,5 +7,7 @@
 ########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=INNODB;
 -- source extra/rpl_tests/rpl_row_func003.test

mysql-test/t/rpl_row_log.test

@@ -11,6 +11,7 @@
 ########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=MyISAM;
 -- source extra/rpl_tests/rpl_log.test
 

mysql-test/t/rpl_row_log_innodb.test

@@ -8,6 +8,7 @@
 -- source include/not_ndb_default.inc
 -- source include/have_binlog_format_row.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 let $engine_type=InnoDB;
 -- source extra/rpl_tests/rpl_log.test
 

mysql-test/t/rpl_row_sp003.test

@@ -7,5 +7,7 @@
 ########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=INNODB;
 -- source extra/rpl_tests/rpl_row_sp003.test

mysql-test/t/rpl_row_sp006_InnoDB.test

@@ -7,5 +7,7 @@
 ########################################################
 -- source include/not_ndb_default.inc
 -- source include/have_innodb.inc
+-- source include/have_binlog_format_row.inc
+-- source include/master-slave.inc
 let $engine_type=InnoDB;
 -- source extra/rpl_tests/rpl_row_sp006.test

mysql-test/t/rpl_stm_log.test

 # Requires statement logging
 -- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/master-slave.inc
 let $engine_type=MyISAM;
 -- source extra/rpl_tests/rpl_log.test
 

mysql-test/t/rpl_truncate_7ndb.test

 
 --source include/have_ndb.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 --source include/have_binlog_format_mixed_or_row.inc
 
 --disable_query_log