Galera MTR Tests: Stability fixes

mysql-test/suite/galera/disabled.def

@@ -36,13 +36,9 @@ 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

mysql-test/suite/galera/r/MW-329.result

@@ -18,3 +18,4 @@ VARIABLE_VALUE > 0
 1
 DROP PROCEDURE proc_insert;
 DROP TABLE t1;
+CALL mtr.add_suppression("conflict state 3 after post commit");

mysql-test/suite/galera/r/galera_as_slave_autoinc.result

@@ -35,11 +35,9 @@ i	c
 show variables like 'binlog_format';
 Variable_name	Value
 binlog_format	STATEMENT
-show variables like '%auto_increment%';
+show variables like 'auto_increment_increment';
 Variable_name	Value
 auto_increment_increment	7
-auto_increment_offset	5
-wsrep_auto_increment_control	ON
 select * from t1;
 i	c
 1	dummy_text

mysql-test/suite/galera/r/galera_ist_restart_joiner.result

@@ -7,9 +7,8 @@ UPDATE t1 SET f2 = 'c' WHERE f1 > 2;
 SET GLOBAL wsrep_provider_options = 'dbug=d,recv_IST_after_apply_trx';
 SET SESSION wsrep_sync_wait = 0;
 Loading wsrep_provider ...
-SHOW STATUS LIKE 'wsrep_debug_sync_waiters';
-Variable_name	Value
-wsrep_debug_sync_waiters	recv_IST_after_apply_trx
+SET SESSION wsrep_on=OFF;
+SET SESSION wsrep_on=ON;
 UPDATE t1 SET f2 = 'd' WHERE f1 > 3;
 CREATE TABLE t2 (f1 INTEGER);
 UPDATE t1 SET f2 = 'e' WHERE f1 > 4;

mysql-test/suite/galera/r/mysql-wsrep#198.result

 CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB;
+SELECT 1 FROM DUAL;
+1
+1
 LOCK TABLE t2 WRITE;
 OPTIMIZE TABLE t1,t2;;
 REPAIR TABLE t1,t2;;

mysql-test/suite/galera/t/MW-329.test

@@ -80,3 +80,6 @@ SELECT VARIABLE_VALUE > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_N
 --connection node_1
 DROP PROCEDURE proc_insert;
 DROP TABLE t1;
+
+# Due to MW-330, Multiple "conflict state 3 after post commit" warnings if table is dropped while SP is running
+CALL mtr.add_suppression("conflict state 3 after post commit");

mysql-test/suite/galera/t/galera_as_slave_autoinc.test

@@ -48,7 +48,7 @@ insert into t1(i) values(null), (null), (null);
 select * from t1;
 
 show variables like 'binlog_format';
-show variables like '%auto_increment%';
+show variables like 'auto_increment_increment';
 
 --connection node_2
 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';

mysql-test/suite/galera/t/galera_gcs_fc_limit.test

@@ -21,11 +21,11 @@ LOCK TABLE t1 WRITE;
 --connection node_1
 --sleep 1
 INSERT INTO t1 VALUES (2);
---sleep 1
+--sleep 2
 INSERT INTO t1 VALUES (3);
---sleep 1
+--sleep 2
 INSERT INTO t1 VALUES (4);
---sleep 1
+--sleep 2
 
 # This query will hang because flow control will kick in
 --send

mysql-test/suite/galera/t/galera_ist_restart_joiner.test

@@ -48,15 +48,16 @@ SET SESSION wsrep_sync_wait = 0;
 # ... and restart provider to force IST
 --echo Loading wsrep_provider ...
 --disable_query_log
+# base_port setting is lost for some reason when unloading provider, so we need to restore it
+--eval SET GLOBAL wsrep_provider_options= 'base_port=$NODE_GALERAPORT_2';
 --eval SET GLOBAL wsrep_provider = '$wsrep_provider_orig';
 --eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig';
 --enable_query_log
 
-# We can not use a wait_condition on SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS as such queries are blocked during IST
-# so we perform a simple sleep and SHOW instead
-
---sleep 5
-SHOW STATUS LIKE 'wsrep_debug_sync_waiters';
+SET SESSION wsrep_on=OFF;
+--let $wait_condition = SELECT VARIABLE_VALUE = '' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters';
+--source include/wait_condition.inc
+SET SESSION wsrep_on=ON;
 
 --connection node_1
 # Perform DML and DDL while IST is in progress

mysql-test/suite/galera/t/mysql-wsrep#198.test

@@ -5,6 +5,9 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB;
 
 --connection node_2
+# Ensure that the tables have been created on node #2
+SELECT 1 FROM DUAL;
+
 LOCK TABLE t2 WRITE;
 
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2