bzr commit into mysql-6.0-codebase-bugfixing branch (tor.didriksen:3637) Bug#13963

[Tor Didriksen]

#At file:///export/home/didrik/mysqldev-6.0-codebase/6.0-codebase-bf-opt/ based on revid:li-bing.song@stripped

 3637 Tor Didriksen	2009-10-02
      Bug#13963 SHOW SLAVE HOSTS is unreliable
      
      Remove dependency on port assignments from test case result.
      to reproduce failure, do e.g.
      $./mtr --mtr-build-thread=1 rpl_show_slave_hosts
     @ mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
        disable log of CHANGE MASTER...
        mask column 3, which also depends on port assignments
     @ mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
        disable log of CHANGE MASTER...
        mask column 3, which also depends on port assignments

    modified:
      mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
      mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
=== modified file 'mysql-test/suite/rpl/r/rpl_show_slave_hosts.result'
--- a/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result	2009-10-01 23:15:18 +0000
+++ b/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result	2009-10-02 09:43:38 +0000
@@ -5,13 +5,12 @@ 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';
 START SLAVE IO_THREAD;
 SHOW SLAVE HOSTS;
 Server_id	Host	Port	Master_id
-3	slave2	3306	1
-2		13001	1
+3	slave2	foo	1
+2		foo	1
 STOP SLAVE IO_THREAD;
 SHOW SLAVE HOSTS;
 Server_id	Host	Port	Master_id
-2		13001	1
+2		foo	1

=== modified file 'mysql-test/suite/rpl/t/rpl_show_slave_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test	2009-10-01 23:15:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test	2009-10-02 09:43:38 +0000
@@ -14,7 +14,9 @@ connect (slave2,127.0.0.1,root,,test,$SL
 
 connection slave2;
 RESET SLAVE;
+--disable_query_log
 --eval CHANGE MASTER TO master_host='127.0.0.1',master_port=$MASTER_MYPORT,master_user='root'
+--enable_query_log
 START SLAVE IO_THREAD;
 source include/wait_for_slave_io_to_start.inc;
 
@@ -24,6 +26,7 @@ let $field= Server_id;
 # 3 is server_id of slave2.
 let $connection= ='3';
 source include/wait_show_condition.inc;
+--replace_column 3 foo
 SHOW SLAVE HOSTS;
 
 connection slave2;
@@ -39,6 +42,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_column 3 foo
 SHOW SLAVE HOSTS;
 
 source include/master-slave-end.inc;


Attachment: [text/bzr-bundle] bzr/[e-mail]