From ff76214a46f8f97e1539d11fd9512620f28c2602 Mon Sep 17 00:00:00 2001
From: Philip Stoev <philip.stoev@galeracluster.com>
Date: Wed, 12 Aug 2015 05:32:18 -0700
Subject: [PATCH] Galera MTR Tests: Various test stability fixes (take #3)

---
 mysql-test/include/wait_condition.inc                 | 1 +
 mysql-test/suite/galera/r/galera_as_slave.result      | 1 +
 mysql-test/suite/galera/t/galera_as_slave.test        | 3 +++
 mysql-test/suite/galera/t/galera_parallel_simple.test | 2 --
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mysql-test/include/wait_condition.inc b/mysql-test/include/wait_condition.inc
index ac61b76db32..7828256e33a 100644
--- a/mysql-test/include/wait_condition.inc
+++ b/mysql-test/include/wait_condition.inc
@@ -39,6 +39,7 @@ let $wait_timeout= 0;
 let $wait_condition_reps= 0;
 while ($wait_counter)
 {
+    --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT
     let $success= `$wait_condition`;
     inc $wait_condition_reps;
     if ($success)
diff --git a/mysql-test/suite/galera/r/galera_as_slave.result b/mysql-test/suite/galera/r/galera_as_slave.result
index 1e86afa35b7..2d7d689aa36 100644
--- a/mysql-test/suite/galera/r/galera_as_slave.result
+++ b/mysql-test/suite/galera/r/galera_as_slave.result
@@ -12,3 +12,4 @@ COUNT(*) = 3
 DROP TABLE t1;
 STOP SLAVE;
 RESET SLAVE ALL;
+RESET MASTER;
diff --git a/mysql-test/suite/galera/t/galera_as_slave.test b/mysql-test/suite/galera/t/galera_as_slave.test
index 79b9e5071a3..849b75eadd1 100644
--- a/mysql-test/suite/galera/t/galera_as_slave.test
+++ b/mysql-test/suite/galera/t/galera_as_slave.test
@@ -45,3 +45,6 @@ DROP TABLE t1;
 
 STOP SLAVE;
 RESET SLAVE ALL;
+
+--connection node_1
+RESET MASTER;
diff --git a/mysql-test/suite/galera/t/galera_parallel_simple.test b/mysql-test/suite/galera/t/galera_parallel_simple.test
index 5b2fd6b3479..b1dc14deb5b 100644
--- a/mysql-test/suite/galera/t/galera_parallel_simple.test
+++ b/mysql-test/suite/galera/t/galera_parallel_simple.test
@@ -37,8 +37,6 @@ INSERT INTO t2 VALUES (1);
 
 SELECT COUNT(*) = 10 FROM t1;
 SELECT COUNT(*) = 10 FROM t2;
-SHOW PROCESSLIST;
-SELECT COUNT(DISTINCT ID) FROM INFORMATION_SCHEMA.PROCESSLIST;
 SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'committed%';
 
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig;