Mdev-12319 Fix galera test failures

8 files changed, 40 insertions, 16 deletions

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 6c3efc77e20..5a10d161211 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -45,16 +45,3 @@ galera_lock_table   : MDEV-11229
 GAL-480 : Investigate
 galera_fk_no_pk :Investigate
 galera_account_management : Investigate
-galera.galera_var_retry_autocommit : MDEV-12319 #Sparodic Faliure
-galera.galera_gcs_fc_limit : MDEV-12319 #Sparodic Faliure
-galera.galera_toi_ddl_nonconflicting : MDEV-12319 #Sparodic Faliure
-galera.mysql-wsrep#198 : MDEV-12319 #Sparodic Faliure
-galera.galera_pc_ignore_sb : MDEV-12319 #Sparodic Faliure
-galera.MW-329 : MDEV-12319 #Sparodic Faliure
-galera.galera_ist_recv_bind : MDEV-12319 #Failed to start mysqld
-galera.galera_ist_restart_joiner : MDEV-12319 #Failed to start mysqld
-galera.galera_ssl_compression : MDEV-12319 #Failed to start mysqld
-galera.galera_wan : MDEV-12319 #Failed to start mysqld
-galera.rpl_row_annotate : MDEV-12319 #Failed to start mysqld
-galera_restart_on_unknown_option : Solve
-galera_kill_applier : Investigate; problem introduced in merge from 10.1
diff --git a/mysql-test/suite/galera/r/MW-329.result b/mysql-test/suite/galera/r/MW-329.result
index 655d8e9e291..73796b5f868 100644
--- a/mysql-test/suite/galera/r/MW-329.result
+++ b/mysql-test/suite/galera/r/MW-329.result
@@ -1,3 +1,4 @@
+CALL mtr.add_suppression("WSREP: .*conflict state . after post commit .*");
 CREATE TABLE t1 (f1 INTEGER, f2 CHAR(20) DEFAULT 'abc') ENGINE=InnoDB;
 INSERT INTO t1 (f1) VALUES (1),(65535);
 FLUSH STATUS;
@@ -12,9 +13,16 @@ WHILE 1 DO
 INSERT INTO t1 (f1) VALUES (FLOOR( 1 + RAND( ) * 65535 ));
 END WHILE;
 END|
+connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connection node_1b;
 CALL proc_insert();;
+connection node_2;
+CALL mtr.add_suppression("WSREP: Failed to report last committed .*");
 SELECT VARIABLE_VALUE > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays';
 VARIABLE_VALUE > 0
 1
+connection node_1;
+connection node_1b;
+connection node_1;
 DROP PROCEDURE proc_insert;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
index a21b1edf3e7..ba6f30fcf30 100644
--- a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
+++ b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
@@ -1,5 +1,8 @@
 CALL mtr.add_suppression("Aborting");
 CALL mtr.add_suppression("unknown option '--galera-unknown-option'");
+connection node_1;
+connection node_2;
+connection node_2;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
 INSERT INTO t1 VALUES (1, 'a'), (2, 'a'), (3, 'a');
 SELECT * FROM t1;
@@ -8,6 +11,7 @@ f1	f2
 2	a
 3	a
 Shutting down server ...
+connection node_1;
 UPDATE t1 SET f2 = 'b' WHERE f1 > 1;
 UPDATE t1 SET f2 = 'c' WHERE f1 > 2;
 SELECT * FROM t1;
@@ -15,6 +19,7 @@ f1	f2
 1	a
 2	b
 3	c
+connection node_2;
 Starting server ...
 Starting server ...
 SELECT * FROM t1;
@@ -23,6 +28,7 @@ f1	f2
 2	b
 3	c
 Shutting down server ...
+connection node_1;
 UPDATE t1 SET f2 = 'd' WHERE f1 > 1;
 UPDATE t1 SET f2 = 'd' WHERE f1 > 2;
 SELECT * FROM t1;
@@ -30,6 +36,7 @@ f1	f2
 1	a
 2	d
 3	d
+connection node_2;
 Starting server ...
 Starting server ...
 SELECT * FROM t1;
@@ -37,4 +44,5 @@ f1	f2
 1	a
 2	d
 3	d
+connection node_1;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_var_retry_autocommit.result b/mysql-test/suite/galera/r/galera_var_retry_autocommit.result
index f4d17ad9a41..392728baf7d 100644
--- a/mysql-test/suite/galera/r/galera_var_retry_autocommit.result
+++ b/mysql-test/suite/galera/r/galera_var_retry_autocommit.result
@@ -1,16 +1,24 @@
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=InnoDB;
 CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.f2 = SLEEP(5);
+connection node_1;
 SET SESSION wsrep_retry_autocommit = 0;
 INSERT INTO t1 (f1) VALUES (1),(2);;
+connection node_2;
 TRUNCATE TABLE t1;
+connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_1;
 SET SESSION wsrep_retry_autocommit = 1;
 INSERT INTO t1 (f1) VALUES (3),(4);;
+connection node_2;
 TRUNCATE TABLE t1;
+connection node_1;
 SELECT * FROM test.t1;
 f1	f2
 3	0
 4	0
+connection node_2;
 CREATE PROCEDURE repeated_truncate ()
 BEGIN
 DECLARE i INT;
@@ -22,11 +30,15 @@ SET i = i + 1;
 END WHILE;
 END|
 CALL repeated_truncate();
+connection node_1;
 SET SESSION wsrep_retry_autocommit = 1;
 INSERT INTO t1 (f1) VALUES (5),(6);
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_1;
 SET SESSION wsrep_retry_autocommit = 1024;
 INSERT INTO t1 (f1) VALUES (7),(8);;
+connection node_2;
+connection node_1;
 include/diff_servers.inc [servers=1 2]
 DROP TABLE t1;
 DROP PROCEDURE repeated_truncate;
diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test
index acf6763b396..5a48352da9b 100644
--- a/mysql-test/suite/galera/t/MW-329.test
+++ b/mysql-test/suite/galera/t/MW-329.test
@@ -5,6 +5,7 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+CALL mtr.add_suppression("WSREP: .*conflict state . after post commit .*");
 CREATE TABLE t1 (f1 INTEGER, f2 CHAR(20) DEFAULT 'abc') ENGINE=InnoDB;
 
 # We start with a populated table
@@ -41,7 +42,8 @@ DELIMITER ;|
 #
 
 --connection node_2
---let $count = 10
+CALL mtr.add_suppression("WSREP: Failed to report last committed .*");
+--let $count = 200
 while ($count)
 {
 	--let $signature = `SELECT LEFT(MD5(RAND()), 10)`
diff --git a/mysql-test/suite/galera/t/galera_kill_applier.test b/mysql-test/suite/galera/t/galera_kill_applier.test
index a8e6c9c8e79..6e3d7ea65d2 100644
--- a/mysql-test/suite/galera/t/galera_kill_applier.test
+++ b/mysql-test/suite/galera/t/galera_kill_applier.test
@@ -6,8 +6,8 @@
 --source include/have_innodb.inc
 
 --connection node_1
-
---let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND NOT STATE <=> 'wsrep aborter idle' AND STATE NOT LIKE 'InnoDB%' LIMIT 1`
+--sleep 1
+--let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE IS NULL LIMIT 1`
 
 --disable_query_log
 --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
diff --git a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test
index 84fd3a91857..89ef2f0f96b 100644
--- a/mysql-test/suite/galera/t/galera_pc_ignore_sb.test
+++ b/mysql-test/suite/galera/t/galera_pc_ignore_sb.test
@@ -20,6 +20,7 @@ SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true';
 --source include/kill_galera.inc
 
 --connection node_1
+--sleep 2
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
index 2f27678b547..a8246e94591 100644
--- a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
+++ b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
@@ -6,6 +6,11 @@
 CALL mtr.add_suppression("Aborting");
 CALL mtr.add_suppression("unknown option '--galera-unknown-option'");
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 #
 # We should count the number of "Assertion failed" warnings
 # in the log file before and after testing. To do this we need
@@ -125,6 +130,7 @@ SELECT * FROM t1;
 --connection node_1
 
 DROP TABLE t1;
+--source include/auto_increment_offset_restore.inc
 
 #
 # We should count the number of "Assertion failed" warnings