Galera MTR Tests: Various test stability fixes (take #3)

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)

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;

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;

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;