summaryrefslogtreecommitdiff
path: root/mysql-test/suite/galera
diff options
context:
space:
mode:
authorPhilip Stoev <philip.stoev@galeracluster.com>2016-08-04 00:33:12 -0700
committerNirbhay Choubey <nirbhay@mariadb.com>2016-08-21 16:20:07 -0400
commitf01a16b54196ef5f816ca5a1bb590262ce0381e6 (patch)
tree722a4348abd027f31b785daea4453bb1ec2c4442 /mysql-test/suite/galera
parent30c6ac3cd152c1280fe9ccfb86b42e8048e3dc91 (diff)
downloadmariadb-git-f01a16b54196ef5f816ca5a1bb590262ce0381e6.tar.gz
Galera MTR Tests: fortify galera_bf_abort_flush_for_export against sporadic failures.
Diffstat (limited to 'mysql-test/suite/galera')
-rw-r--r--mysql-test/suite/galera/r/galera_bf_abort_flush_for_export.result7
-rw-r--r--mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test5
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/galera/r/galera_bf_abort_flush_for_export.result b/mysql-test/suite/galera/r/galera_bf_abort_flush_for_export.result
index 8c07d87eec3..96ed226c3ab 100644
--- a/mysql-test/suite/galera/r/galera_bf_abort_flush_for_export.result
+++ b/mysql-test/suite/galera/r/galera_bf_abort_flush_for_export.result
@@ -6,9 +6,10 @@ SET SESSION wsrep_sync_wait = 0;
UNLOCK TABLES;
COMMIT;
SET AUTOCOMMIT=ON;
-SELECT * FROM t1;
-f1
-2
+SET SESSION wsrep_sync_wait = 7;
+SELECT COUNT(*) = 1 FROM t1;
+COUNT(*) = 1
+1
wsrep_local_aborts_increment
1
DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test b/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
index dbbe3b3c483..e32089ce21e 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
+++ b/mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
@@ -27,9 +27,8 @@ UNLOCK TABLES;
COMMIT;
SET AUTOCOMMIT=ON;
---let $wait_condition = SELECT COUNT(*) = 1 FROM t1
---source include/wait_condition.inc
-SELECT * FROM t1;
+SET SESSION wsrep_sync_wait = 7;
+SELECT COUNT(*) = 1 FROM t1;
--let $wsrep_local_bf_aborts_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`