MDEV-11229: galera.MW-258 galera.galera_as_master fail in buildbot.

7 files changed, 15 insertions, 18 deletions

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index be4eb210f2f..20c1cb39f87 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -30,12 +30,6 @@ galera_gcs_fragment : Incorrect arguments to SET
 galera_flush_local : Fails sporadically
 galera_binlog_stmt_autoinc : TODO: investigate
 galera_concurrent_ctas : Test times out, investigate
-MW-258              : MDEV-11229
-galera_as_master    : MDEV-11229
-MW-44               : MDEV-11229
-galera_gcs_fc_limit : MDEV-11229
-galera_roles        : MDEV-11229
-galera_lock_table   : MDEV-11229
 MW-286 : TODO: investigate
 galera_sst_xtrabackup-v2-options : TODO: Fix test case
 galera_sst_xtrabackup-v2 : MDEV-11208
diff --git a/mysql-test/suite/galera/t/MW-258.test b/mysql-test/suite/galera/t/MW-258.test
index f5519f8a081..f00b82d6bb4 100644
--- a/mysql-test/suite/galera/t/MW-258.test
+++ b/mysql-test/suite/galera/t/MW-258.test
@@ -34,6 +34,7 @@ UNLOCK TABLES;
 
 --connection node_1
 --echo value after RSU:
+--sleep 2
 SHOW STATUS LIKE 'wsrep_desync_count';
 SHOW VARIABLES LIKE 'wsrep_desync';
 SET GLOBAL wsrep_desync=0;
diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test
index 55a3fd57f80..133676b9141 100644
--- a/mysql-test/suite/galera/t/MW-44.test
+++ b/mysql-test/suite/galera/t/MW-44.test
@@ -8,9 +8,11 @@
 --connection node_1
 TRUNCATE TABLE mysql.general_log;
 
+--sleep 1
 --connection node_2
 TRUNCATE TABLE mysql.general_log;
 
+--sleep 1
 --connection node_1
 SET SESSION wsrep_osu_method=TOI;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
diff --git a/mysql-test/suite/galera/t/galera_as_master.test b/mysql-test/suite/galera/t/galera_as_master.test
index 93f9224b258..a56fb6dc976 100644
--- a/mysql-test/suite/galera/t/galera_as_master.test
+++ b/mysql-test/suite/galera/t/galera_as_master.test
@@ -27,6 +27,7 @@ CREATE TABLE test.t3 AS SELECT * from t1;
 SET SQL_LOG_BIN=ON;
 INSERT INTO t1 VALUES(3);
 CREATE TABLE test.t4 AS SELECT * from t1;
+--save_master_pos
 
 --connection node_2
 SELECT * FROM t1;
@@ -35,28 +36,21 @@ SELECT * FROM t3;
 SELECT * FROM t4;
 
 --connection node_3
+--sync_with_master
 SHOW TABLES;
 
---let $wait_condition = SELECT COUNT(*) = 2 FROM t1;
---source include/wait_condition.inc
-
---let $wait_condition = SELECT COUNT(*) = 3 FROM t4;
---source include/wait_condition.inc
-
 SELECT * FROM t1;
 SELECT * FROM t4;
 
 --echo # Cleanup
 --connection node_1
 DROP TABLE t1, t4;
+--save_master_pos
 SET SQL_LOG_BIN=OFF;
 DROP TABLE t2, t3;
 
 --connection node_3
---let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
---source include/wait_condition.inc
---let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't4';
---source include/wait_condition.inc
+--sync_with_master
 
 STOP SLAVE;
 RESET SLAVE ALL;
diff --git a/mysql-test/suite/galera/t/galera_gcs_fc_limit.test b/mysql-test/suite/galera/t/galera_gcs_fc_limit.test
index 721d84ecb05..dc65a452d7c 100644
--- a/mysql-test/suite/galera/t/galera_gcs_fc_limit.test
+++ b/mysql-test/suite/galera/t/galera_gcs_fc_limit.test
@@ -19,10 +19,13 @@ SET GLOBAL wsrep_provider_options = 'gcs.fc_limit=1';
 LOCK TABLE t1 WRITE;
 
 --connection node_1
-
+--sleep 1
 INSERT INTO t1 VALUES (2);
+--sleep 1
 INSERT INTO t1 VALUES (3);
+--sleep 1
 INSERT INTO t1 VALUES (4);
+--sleep 1
 
 # This query will hang because flow control will kick in
 --send
diff --git a/mysql-test/suite/galera/t/galera_lock_table.test b/mysql-test/suite/galera/t/galera_lock_table.test
index bd581842f6f..0bcaf646917 100644
--- a/mysql-test/suite/galera/t/galera_lock_table.test
+++ b/mysql-test/suite/galera/t/galera_lock_table.test
@@ -11,6 +11,8 @@
 CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB;
 
+--sleep 1
+
 --connection node_2
 LOCK TABLE t1 READ;
 
diff --git a/mysql-test/suite/galera/t/galera_roles.test b/mysql-test/suite/galera/t/galera_roles.test
index 16e417d1fdb..79951ad10c8 100644
--- a/mysql-test/suite/galera/t/galera_roles.test
+++ b/mysql-test/suite/galera/t/galera_roles.test
@@ -36,6 +36,7 @@ GRANT SELECT (a) ON test1.t2 TO role1;
 --connect(foo_node_1,127.0.0.1,foo,,test,$port_1,)
 
 --let $port_2= \$NODE_MYPORT_2
+--sleep 1
 --connect(foo_node_2,127.0.0.1,foo,,test,$port_2,)
 
 --echo
@@ -107,7 +108,7 @@ CALL test1.pr1();
 --echo
 --echo # Connect with foo_node_2
 --connection foo_node_2
-
+--sleep 1
 --error ER_PROCACCESS_DENIED_ERROR
 CALL test1.pr1();