summaryrefslogtreecommitdiff
path: root/mysql-test/suite/multi_source
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2014-11-19 14:34:49 +0400
committerElena Stepanova <elenst@montyprogram.com>2014-11-19 14:34:49 +0400
commit416f267a7acc42fd0949b30a54344822b74ed380 (patch)
tree4b3e1d85eaf0f595b915b451d81170f4ac859c0c /mysql-test/suite/multi_source
parent154ec0f4201a617be5998537e29f0ad15e44f803 (diff)
downloadmariadb-git-416f267a7acc42fd0949b30a54344822b74ed380.tar.gz
MDEV-7074 multi_source.simple test fails in buildbot
The problem is that the binlog position is updated before Executed_log_entries and Slave_SQL_State. So, it's possible to hit the moment when MASTER_POS_WAIT (and hence sync_with_master) already returned success, but Slave_SQL_State and Executed_log_entries were not modified yet. Fixing it by adding a wait on the expected Executed_log_entries value.
Diffstat (limited to 'mysql-test/suite/multi_source')
-rw-r--r--mysql-test/suite/multi_source/simple.test7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/suite/multi_source/simple.test b/mysql-test/suite/multi_source/simple.test
index c3b7a60448a..6108d3043d5 100644
--- a/mysql-test/suite/multi_source/simple.test
+++ b/mysql-test/suite/multi_source/simple.test
@@ -33,6 +33,13 @@ set default_master_connection = '';
--connection slave
--sync_with_master 0,'slave2'
+# MDEV-7074 (Sporadic test failure due to a race condition)
+let $show_statement = SHOW ALL SLAVES STATUS;
+let $field = Executed_log_entries;
+let $condition = = 7;
+let $wait_for_all = 1;
+--source include/wait_show_condition.inc
+
--replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2
show all slaves status;