Galera test fixes

Changes to be committed:
	modified:   suite/galera/disabled.def
	modified:   suite/galera/r/MW-329.result
	modified:   suite/galera/r/galera_var_notify_cmd.result
	modified:   suite/galera/t/MW-329.test
	modified:   suite/galera/t/galera_binlog_stmt_autoinc.test
	modified:   suite/galera/t/galera_var_notify_cmd.test

6 files changed, 10 insertions, 9 deletions

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 4b872e4bd68..4e769ff2b97 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -22,6 +22,7 @@ galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB
 galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid_log_event::do_apply_event()
 galera_autoinc_sst_mariabackup : MDEV-19926 Galera SST tests fail
 galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events
+galera_binlog_stmt_autoinc: MDEV-19959 Galera test failure on galera_binlog_stmt_autoinc
 galera_flush :  MariaDB does not have global.thread_statistics
 galera_gcache_recover_manytrx : MDEV-18834 Galera test failure
 galera_ist_mariabackup : MDEV-18829 test leaves port open
@@ -34,4 +35,4 @@ galera_ssl_upgrade : MDEV-19950 Galera test failure on galera_ssl_upgrade
 galera_sst_mariabackup_encrypt_with_key : MDEV-19926 Galera SST tests fail
 galera_var_slave_threads : MDEV-19746 Galera test failures because of wsrep_slave_threads identification
 galera_wan : MDEV-17259: Test failure on galera.galera_wan
-
+partition: MDEV-19958 Galera test failure on galera.partition
diff --git a/mysql-test/suite/galera/r/MW-329.result b/mysql-test/suite/galera/r/MW-329.result
index a3cb7277a9c..b6d88573d58 100644
--- a/mysql-test/suite/galera/r/MW-329.result
+++ b/mysql-test/suite/galera/r/MW-329.result
@@ -11,16 +11,12 @@ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END;
 SET SESSION wsrep_sync_wait = 0;
 WHILE 1 DO
 INSERT INTO t1 (f1) VALUES (FLOOR( 1 + RAND( ) * 65535 ));
+SELECT SLEEP(0.1);
 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;
diff --git a/mysql-test/suite/galera/r/galera_var_notify_cmd.result b/mysql-test/suite/galera/r/galera_var_notify_cmd.result
index bcd9875743a..3f0dd57aa3b 100644
--- a/mysql-test/suite/galera/r/galera_var_notify_cmd.result
+++ b/mysql-test/suite/galera/r/galera_var_notify_cmd.result
@@ -8,4 +8,3 @@ MAX(size) = 2
 SELECT COUNT(DISTINCT idx) = 2 FROM mtr_wsrep_notify.status;
 COUNT(DISTINCT idx) = 2
 1
-DROP SCHEMA mtr_wsrep_notify;
diff --git a/mysql-test/suite/galera/t/MW-329.test b/mysql-test/suite/galera/t/MW-329.test
index 5baa4d14966..dc2693ab859 100644
--- a/mysql-test/suite/galera/t/MW-329.test
+++ b/mysql-test/suite/galera/t/MW-329.test
@@ -27,6 +27,7 @@ BEGIN
         SET SESSION wsrep_sync_wait = 0;
         WHILE 1 DO
 		INSERT INTO t1 (f1) VALUES (FLOOR( 1 + RAND( ) * 65535 ));
+		SELECT SLEEP(0.1);
         END WHILE;
 END|
 DELIMITER ;|
@@ -34,6 +35,8 @@ DELIMITER ;|
 --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1
 --connection node_1b
 --let $connection_id = `SELECT CONNECTION_ID()`
+--disable_query_log
+--disable_result_log
 --send CALL proc_insert();
 
 #
@@ -78,6 +81,8 @@ SELECT VARIABLE_VALUE > 0 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_N
 --connection node_1b
 --error 0,2013,1317
 --reap
+--enable_query_log
+--enable_result_log
 
 --connection node_1
 DROP PROCEDURE proc_insert;
diff --git a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
index d3889a89016..817f4f82b43 100644
--- a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
+++ b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
@@ -66,6 +66,8 @@ show variables like 'binlog_format';
 
 SET GLOBAL wsrep_auto_increment_control='OFF';
 
+let $increment_node1 = `SELECT @@session.auto_increment_increment`;
+let $offset_node1 = `SELECT @@session.auto_increment_offset`;
 SET SESSION auto_increment_increment = 3;
 SET SESSION auto_increment_offset = 1;
 
diff --git a/mysql-test/suite/galera/t/galera_var_notify_cmd.test b/mysql-test/suite/galera/t/galera_var_notify_cmd.test
index 4fea69f62bb..b261f878ced 100644
--- a/mysql-test/suite/galera/t/galera_var_notify_cmd.test
+++ b/mysql-test/suite/galera/t/galera_var_notify_cmd.test
@@ -10,5 +10,3 @@
 SELECT COUNT(DISTINCT uuid) = 2 FROM mtr_wsrep_notify.membership;
 SELECT MAX(size) = 2 FROM mtr_wsrep_notify.status;
 SELECT COUNT(DISTINCT idx) = 2 FROM mtr_wsrep_notify.status;
-
-DROP SCHEMA mtr_wsrep_notify;