diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-06-24 16:33:31 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-06-24 16:33:31 +0200 |
| commit | 748e8a35c9ce3d2fa02758f59f4fb6d545e80d36 (patch) | |
| tree | 167a9e6c7102ee236bc6b16c0e278b824b77d558 /mysql-test | |
| parent | df66ee7fe9138745a8d5a86f61108217a6d0906f (diff) | |
| download | mariadb-git-748e8a35c9ce3d2fa02758f59f4fb6d545e80d36.tar.gz | |
Fix sporadic failure of test rpl.rpl_gtid_startpos
The test did RESET MASTER and then tried to use --sync_with_master
to wait for GTID-based replication to catch up. This though has
a race, there is a small window where the _old_ pre-RESET MASTER
position on the slave is higher than the new pos-RESET MASTER
position, causing the --sync_with_master to be a no-op.
Fix by using include/wait_condition.inc instead.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_gtid_startpos.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_startpos.test b/mysql-test/suite/rpl/t/rpl_gtid_startpos.test index a943b2bf179..0797eead0ee 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_startpos.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_startpos.test @@ -249,11 +249,11 @@ SET GLOBAL gtid_slave_pos=""; RESET MASTER; TRUNCATE TABLE t1; INSERT INTO t1 VALUES (10); # Will be GTID 0-1-2 ---save_master_pos --connection server_2 --source include/start_slave.inc ---sync_with_master +--let $wait_condition= SELECT COUNT(*) = 1 FROM t1 +--source include/wait_condition.inc SELECT * FROM t1; --let $value= query_get_value(SHOW SLAVE STATUS, "Using_Gtid", 1) |