From b80b52394d41a4c334642ae8b3af16f76f6fac57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Mon, 22 Jun 2020 13:25:25 +0300
Subject: [PATCH] Test case cleanups.

---
 mysql-test/suite/galera/r/galera_as_slave_gtid.result      | 1 +
 .../suite/galera/r/galera_as_slave_gtid_auto_engine.result | 1 +
 .../suite/galera/r/galera_as_slave_gtid_myisam.result      | 3 ++-
 mysql-test/suite/galera/suite.pm                           | 3 ++-
 mysql-test/suite/galera/t/galera_as_slave_gtid.inc         | 7 +++++++
 mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test | 7 +++++--
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid.result b/mysql-test/suite/galera/r/galera_as_slave_gtid.result
index 3f4137a3b28..41d9085ccac 100644
--- a/mysql-test/suite/galera/r/galera_as_slave_gtid.result
+++ b/mysql-test/suite/galera/r/galera_as_slave_gtid.result
@@ -9,6 +9,7 @@ INSERT INTO t1 VALUES(1);
 SELECT LENGTH(@@global.gtid_binlog_state) > 1;
 LENGTH(@@global.gtid_binlog_state) > 1
 1
+connection node_1;
 connection node_2;
 gtid_binlog_state_equal
 1
diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid_auto_engine.result b/mysql-test/suite/galera/r/galera_as_slave_gtid_auto_engine.result
index 6c84c1ecd31..cff5bb0a5d0 100644
--- a/mysql-test/suite/galera/r/galera_as_slave_gtid_auto_engine.result
+++ b/mysql-test/suite/galera/r/galera_as_slave_gtid_auto_engine.result
@@ -9,6 +9,7 @@ INSERT INTO t1 VALUES(1);
 SELECT LENGTH(@@global.gtid_binlog_state) > 1;
 LENGTH(@@global.gtid_binlog_state) > 1
 1
+connection node_1;
 connection node_2;
 gtid_binlog_state_equal
 1
diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result b/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result
index 7e8da675ad4..b498f334bf8 100644
--- a/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result
+++ b/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result
@@ -31,7 +31,6 @@ DROP TABLE t1;
 connection node_1;
 connection node_2;
 connection node_3;
-connection node_3;
 RESET MASTER;
 connection node_1;
 STOP SLAVE;
@@ -43,3 +42,5 @@ connection node_2;
 SET GLOBAL WSREP_ON=OFF;
 reset master;
 SET GLOBAL WSREP_ON=ON;
+connection node_3;
+RESET MASTER;
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
index 4dd11f5d7a4..671fd1688c9 100644
--- a/mysql-test/suite/galera/suite.pm
+++ b/mysql-test/suite/galera/suite.pm
@@ -62,7 +62,8 @@ push @::global_suppressions,
      qr(WSREP: Ignoring error*),
      qr(WSREP: Failed to remove page file .*),
      qr(WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to .*),
-     qr(WSREP: .*Transport endpoint is not connected.*),
+     qr|WSREP: Sending JOIN failed: -107 \(Transport endpoint is not connected\). Will retry in new primary component.|,
+     qr|WSREP: Trying to continue unpaused monitor|,
    );
 
 sub skip_combinations {
diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid.inc b/mysql-test/suite/galera/t/galera_as_slave_gtid.inc
index f5222b4322b..461e7833a94 100644
--- a/mysql-test/suite/galera/t/galera_as_slave_gtid.inc
+++ b/mysql-test/suite/galera/t/galera_as_slave_gtid.inc
@@ -27,6 +27,13 @@ INSERT INTO t1 VALUES(1);
 SELECT LENGTH(@@global.gtid_binlog_state) > 1;
 --let $gtid_binlog_state_node1 = `SELECT @@global.gtid_binlog_state;`
 
+--connection node_1
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
+--source include/wait_condition.inc
+
+--let $wait_condition = SELECT COUNT(*) = 1 FROM t1;
+--source include/wait_condition.inc
+
 --connection node_2
 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test b/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test
index 004f5c825bb..8787f864a99 100644
--- a/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test
+++ b/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test
@@ -59,6 +59,8 @@ SELECT COUNT(*) AS EXPECT_0 FROM t1;
 --connection node_3
 DROP TABLE t1;
 
+--sleep 1
+
 --connection node_1
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
@@ -70,8 +72,6 @@ DROP TABLE t1;
 --connection node_3
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
-
---connection node_3
 RESET MASTER;
 
 --connection node_1
@@ -85,3 +85,6 @@ SET GLOBAL WSREP_ON=ON;
 SET GLOBAL WSREP_ON=OFF;
 reset master;
 SET GLOBAL WSREP_ON=ON;
+
+--connection node_3
+RESET MASTER;