diff options
| author | unknown <lars@mysql.com> | 2005-09-12 10:50:42 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-09-12 10:50:42 +0200 |
| commit | eac9a337781a67eb6b64846465af6f89d356e174 (patch) | |
| tree | 3a2ba59ef99a4d4075b5e373c9f8bc6299ff55b0 /mysql-test | |
| parent | e21f484390dde4f316a9b44a4ea7709db5f9394f (diff) | |
| download | mariadb-git-eac9a337781a67eb6b64846465af6f89d356e174.tar.gz | |
Reverted old fix with sync_slave_with_master and added a replace commands
to eliminate nondeterminism in slave start
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_slave_status.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_slave_status.test | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_slave_status.result b/mysql-test/r/rpl_slave_status.result index 8badbab85ff..2146132aeb0 100644 --- a/mysql-test/r/rpl_slave_status.result +++ b/mysql-test/r/rpl_slave_status.result @@ -19,7 +19,7 @@ flush privileges; stop slave; start slave; show slave status; -Slave_IO_State Connecting to master +Slave_IO_State # Master_Host 127.0.0.1 Master_User rpl Master_Port MASTER_MYPORT diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test index 247e562eafa..67d3816f443 100644 --- a/mysql-test/t/rpl_slave_status.test +++ b/mysql-test/t/rpl_slave_status.test @@ -19,12 +19,13 @@ select * from t1; connection master; delete from mysql.user where user='rpl'; flush privileges; -sync_slave_with_master; connection slave; stop slave; start slave; --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 7 # 8 # 9 # 22 # 23 # +# Column 1 is replaced, since the output can be either +# "Connecting to master" or "Waiting for master update" +--replace_column 1 # 7 # 8 # 9 # 22 # 23 # --vertical_results show slave status; |