diff options
| author | unknown <Li-Bing.Song@sun.com> | 2009-12-16 12:41:15 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2009-12-16 12:41:15 +0800 |
| commit | c7d483155bb74b9129eeb50c2c90f8fc3215f323 (patch) | |
| tree | f1a5029f93affca3853b4d1c8293d86c775ad5be | |
| parent | 0b7768bc8d29c18596467d3da14dc1aefcdf9c6c (diff) | |
| download | mariadb-git-c7d483155bb74b9129eeb50c2c90f8fc3215f323.tar.gz | |
Bug #46827 rpl_circular_for_4_hosts failed on PB2
This test case tests a circular replication of four hosts.
A--->B--->C--->D--->A
The replicate is slow and needs more time to replicate all data in the circle.
The time it spends to replicate, sometimes, is longer than the time that
wait_condition.inc spends to wait that all data has been replicated. This
cause sporadical failure of this test case.
This patch uses sync_slave_with_master to ensure that all data can be replicated
successfully in the circle.
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test index a49253f90c1..3633462d68e 100644 --- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test @@ -233,16 +233,7 @@ COMMIT; --connection master_a --enable_query_log - ---let $wait_condition= SELECT COUNT(*)=400 FROM t2 WHERE c = 1 ---connection master_a ---source include/wait_condition.inc ---connection master_b ---source include/wait_condition.inc ---connection master_c ---source include/wait_condition.inc ---connection master_d ---source include/wait_condition.inc +--source include/circular_rpl_for_4_hosts_sync.inc --connection master_a SELECT 'Master A',b,COUNT(*) FROM t2 WHERE c = 1 GROUP BY b ORDER BY b; @@ -282,15 +273,7 @@ ROLLBACK; --connection master_a --enable_query_log ---let $wait_condition= SELECT COUNT(*)=200 FROM t2 WHERE c = 2 ---connection master_a ---source include/wait_condition.inc ---connection master_b ---source include/wait_condition.inc ---connection master_c ---source include/wait_condition.inc ---connection master_d ---source include/wait_condition.inc +--source include/circular_rpl_for_4_hosts_sync.inc --connection master_a SELECT 'Master A',b,COUNT(*) FROM t2 WHERE c = 2 GROUP BY b ORDER BY b; |