diff options
| author | unknown <Li-Bing.Song@sun.com> | 2009-10-23 10:19:50 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2009-10-23 10:19:50 +0800 |
| commit | 871bc4bd64efc4d94280cfab91525d54710869e5 (patch) | |
| tree | 2e27b3fce45d529ac247a6629ddbd42667b0a52b /mysql-test/suite | |
| parent | 36fd029eff9526e0f09f6cb081cb84cfd5dd3773 (diff) | |
| download | mariadb-git-871bc4bd64efc4d94280cfab91525d54710869e5.tar.gz | |
BUG #13963
Postfix
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_show_slave_hosts.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_show_slave_hosts.test | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result b/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result index c9cefc4625b..9838d8b08a8 100644 --- a/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result +++ b/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result @@ -5,13 +5,13 @@ reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; RESET SLAVE; -CHANGE MASTER TO master_host='127.0.0.1',master_port=13000,master_user='root'; +CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_PORT,master_user='root'; START SLAVE IO_THREAD; SHOW SLAVE HOSTS; Server_id Host Port Master_id -3 slave2 3306 1 -2 13001 1 +3 slave2 DEFAULT_PORT 1 +2 SLAVE_PORT 1 STOP SLAVE IO_THREAD; SHOW SLAVE HOSTS; Server_id Host Port Master_id -2 13001 1 +2 SLAVE_PORT 1 diff --git a/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test b/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test index 19ec680cbd1..9f202487968 100644 --- a/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test +++ b/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test @@ -14,6 +14,7 @@ connect (slave2,127.0.0.1,root,,test,$SLAVE_MYPORT2,); connection slave2; RESET SLAVE; +--replace_result $MASTER_MYPORT MASTER_PORT --eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$MASTER_MYPORT,master_user='root' START SLAVE IO_THREAD; source include/wait_for_slave_io_to_start.inc; @@ -24,6 +25,7 @@ let $field= Server_id; # 3 is server_id of slave2. let $connection= ='3'; source include/wait_show_condition.inc; +--replace_result $SLAVE_MYPORT SLAVE_PORT $DEFAULT_MASTER_PORT DEFAULT_PORT SHOW SLAVE HOSTS; connection slave2; @@ -39,6 +41,7 @@ let $condition= <> '3'; # knew the leave of slave2 and has unregistered it. let $wait_for_all= 1; source include/wait_show_condition.inc; +--replace_result $SLAVE_MYPORT SLAVE_PORT SHOW SLAVE HOSTS; source include/master-slave-end.inc; |