Merge pull request #722 from codership/MDEV-16006

MDEV-16006 Fix test galera_kill_nochanges
MariaDB · Apr 25, 2018 · 7793432 · 7793432
2 parents 2cdaa56 + dfb1fda
commit 7793432
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/mysql-test/suite/galera/r/galera_kill_nochanges.result b/mysql-test/suite/galera/r/galera_kill_nochanges.result
@@ -1,6 +1,8 @@
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 Killing server ...
+SET SESSION wsrep_sync_wait = 0;
+SET SESSION wsrep_sync_wait = DEFAULT;
 SELECT COUNT(*) = 1 FROM t1;
 COUNT(*) = 1
 1

diff --git a/mysql-test/suite/galera/t/galera_kill_nochanges.test b/mysql-test/suite/galera/t/galera_kill_nochanges.test
@@ -11,6 +11,14 @@ INSERT INTO t1 VALUES (1);
 
 --connection node_2
 --source include/kill_galera.inc
+
+--connection node_1
+SET SESSION wsrep_sync_wait = 0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'
+--source include/wait_condition.inc
+SET SESSION wsrep_sync_wait = DEFAULT;
+
+--connection node_2
 --source include/start_mysqld.inc
 
 --let $galera_connection_name = node_2a