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

philip-galera · Nirbhay Choubey · commit ee22ac380810 · 2015-09-09T22:53:39.000-04:00
diff --git a/mysql-test/include/wait_condition.inc b/mysql-test/include/wait_condition.inc
@@ -39,7 +39,7 @@ let $wait_timeout= 0;
 let $wait_condition_reps= 0;
 while ($wait_counter)
 {
-    --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT
+    --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR
     let $success= `$wait_condition`;
     inc $wait_condition_reps;
     if ($success)
diff --git a/mysql-test/suite/galera/t/galera_split_brain.test b/mysql-test/suite/galera/t/galera_split_brain.test
@@ -38,7 +38,7 @@ SET GLOBAL wsrep_cluster_address = '';
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
 --source include/wait_condition.inc
 
---sleep 5
+--sleep 10
 
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --source include/wait_until_connected_again.inc

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ let $wait_timeout= 0;`
`39`	`39`	`let $wait_condition_reps= 0;`
`40`	`40`	`while ($wait_counter)`
`41`	`41`	`{`
`42`		`- --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT`
	`42`	`+ --error 0,ER_NO_SUCH_TABLE,ER_LOCK_WAIT_TIMEOUT,ER_UNKNOWN_COM_ERROR`
`43`	`43`	let $success= `$wait_condition`;
`44`	`44`	`inc $wait_condition_reps;`
`45`	`45`	`if ($success)`