diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-26 14:30:22 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-11-26 14:30:22 +0100 |
| commit | a6bd3ba9b7092e458b70de03abb7aba4d3511ed3 (patch) | |
| tree | f4da4b04738f490cc6a19852af5e3ff15f276d5e /mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | |
| parent | 65120d9576a08cbdcfe18779ccd5508cb6d8edfb (diff) | |
| parent | 067710eba1e3c958fb64fe569fae027afc65fd90 (diff) | |
| download | mariadb-git-a6bd3ba9b7092e458b70de03abb7aba4d3511ed3.tar.gz | |
upmerge 58515
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_heartbeat_basic.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test index 1f8ce4c1d78..afa304531b8 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test @@ -153,15 +153,11 @@ SET @@global.slave_net_timeout=50; --enable_warnings --replace_result $MASTER_MYPORT MASTER_PORT eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=30; ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -wait -EOF +--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect --echo Reload slave --shutdown_server 10 --source include/wait_until_disconnected.inc ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.2.expect -restart -EOF +--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect --enable_reconnect --source include/wait_until_connected_again.inc SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period'; @@ -456,15 +452,11 @@ let $status_var_comparsion= >; --source include/wait_for_status_var.inc --echo Heartbeat event received --connection master ---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -wait -EOF +--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --echo Reload master --shutdown_server 10 --source include/wait_until_disconnected.inc ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect -restart -EOF +--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --enable_reconnect --source include/wait_until_connected_again.inc --connection slave |