diff options
| author | Sachin <sachin.setiya@mariadb.com> | 2020-03-23 15:20:04 +0530 |
|---|---|---|
| committer | Sachin <sachin.setiya@mariadb.com> | 2020-03-23 15:21:45 +0530 |
| commit | e7dd8377923a3fc59bb48428785b719d5c1767eb (patch) | |
| tree | adf7c1eaf27852e61232d69c4ed1f4cd70702ce8 | |
| parent | fd5c36bed5de65e85900c9fc9f0ed2092c4b38c5 (diff) | |
| download | mariadb-git-e7dd8377923a3fc59bb48428785b719d5c1767eb.tar.gz | |
MDEV-16272 rpl.rpl_semisync_ali_issues failed in buildbot with wrong result
Since start slave does wait for slave to start, Use start_slave.inc and
stop_slave.inc
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result index 9607e8a7998..6f7c1f2167f 100644 --- a/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result +++ b/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result @@ -28,7 +28,7 @@ connection slave; [ enable semi-sync on slave ] stop slave; set global rpl_semi_sync_slave_enabled = 1; -start slave; +include/start_slave.inc show status like 'rpl_semi_sync_slave%'; Variable_name Value Rpl_semi_sync_slave_send_ack 0 @@ -348,6 +348,6 @@ SET GLOBAL rpl_semi_sync_master_enabled = 0; DROP TABLE t1; connection slave; SET GLOBAL rpl_semi_sync_slave_enabled = 0; -stop slave; -start slave; +include/stop_slave.inc +include/start_slave.inc include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test index 52cd9e31753..58ca275a718 100644 --- a/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test +++ b/mysql-test/suite/rpl/t/rpl_semisync_ali_issues.test @@ -30,7 +30,7 @@ connection slave; echo [ enable semi-sync on slave ]; stop slave; set global rpl_semi_sync_slave_enabled = 1; -start slave; +--source include/start_slave.inc show status like 'rpl_semi_sync_slave%'; connection master; @@ -405,6 +405,7 @@ SET GLOBAL rpl_semi_sync_master_enabled = 0; DROP TABLE t1; connection slave; SET GLOBAL rpl_semi_sync_slave_enabled = 0; -stop slave;start slave; +--source include/stop_slave.inc +--source include/start_slave.inc --source include/rpl_end.inc |