ndb test suite cleanup + making ndb_autodiscover3 less flaky

mysql-test/lib/mtr_cases.pl

@@ -611,6 +611,7 @@ our @tags=
  ["include/big_test.inc", "big_test", 1],
  ["include/have_debug.inc", "need_debug", 1],
  ["include/have_ndb.inc", "ndb_test", 1],
+ ["include/have_multi_ndb.inc", "ndb_test", 1],
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
  ["require_manager", "require_manager", 1],
 );

mysql-test/t/ndb_alter_table.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_alter_table2.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_alter_table3.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_autodiscover3.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc
@@ -10,6 +9,9 @@
 drop table if exists t1, t2;
 --enable_warnings
 
+connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (con2,127.0.0.1,root,,test,$MASTER_MYPORT1,);
+
 # Workaround for Bug#27644
 # ndb: connecting api node/mysqld may "steal" node_id from running mysqld
 # - let ndb_waiter use a fixed node id so "steal" cannot happen
@@ -27,8 +29,14 @@ insert into t1 values (1);
 --exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 # Wait for mysqld to reconnect and exit from readonly mode
-# Should preferrably be a "while (!"select ndb_readonly")" loop
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
+--connection server1
 --error 1297
 insert into t1 values (2);
 --error 1296
@@ -47,8 +55,13 @@ select * from t2 order by a limit 3;
 --exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
 --connection server2
 --error ER_NO_SUCH_TABLE
 select * from t2;
@@ -66,8 +79,13 @@ reset master;
 --exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
 # to ensure mysqld has connected again, and recreated system tables
---exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -r 30 -d cluster ndb_apply_status >> $NDB_TOOLS_OUTPUT
-sleep 2;
+--disable_query_log
+--connection con1
+--source include/ndb_not_readonly.inc
+--connection con2
+--source include/ndb_not_readonly.inc
+--enable_query_log
+
 --connection server1
 --error ER_NO_SUCH_TABLE
 select * from t2;

mysql-test/t/ndb_binlog_ddl_multi.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 

mysql-test/t/ndb_binlog_log_bin.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 

mysql-test/t/ndb_binlog_multi.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/have_binlog_format_row.inc
 

mysql-test/t/ndb_cache_multi.test

 -- source include/have_query_cache.inc
--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_cache_multi2.test

 -- source include/have_query_cache.inc
--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

mysql-test/t/ndb_single_user.test

--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/ndb_default_cluster.inc
 -- source include/not_embedded.inc

mysql-test/t/rpl_ndb_ctype_ucs2_def.test

 --source include/have_ucs2.inc
 --source include/have_ndb.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #
 # MySQL Bug#15276: MySQL ignores collation-server