diff options
| author | Philip Stoev <philip.stoev@galeracluster.com> | 2015-08-14 01:16:25 -0700 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-09 22:53:39 -0400 |
| commit | ee22ac3808101d912a1b110d5613c165bcf1aad7 (patch) | |
| tree | fcbb7e473907b5be7598002773e3377f8e2ba29b /mysql-test | |
| parent | 7d73931cbcc03e4b6f0939f29be7e998585b555e (diff) | |
| download | mariadb-git-ee22ac3808101d912a1b110d5613c165bcf1aad7.tar.gz | |
Galera MTR Tests: Various test stability fixes (take #5)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/wait_condition.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_split_brain.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/wait_condition.inc b/mysql-test/include/wait_condition.inc index 7828256e33a..5fbde6950c8 100644 --- 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 index c3e779618df..e0298e55422 100644 --- 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 |