bzr commit into mysql-5.1-rep+2 branch (zhenxing.he:3117) Bug#41613

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/backport/5.1-rep%2B2/ based on revid:zhenxing.he@stripped

 3117 He Zhenxing	2009-10-02
      Backport BUG#41613 Slave I/O status inconsistent between SHOW SLAVE STATUS and START SLAVE
      
      There are three internal status for slave I/O thread, both
      MYSQL_SLAVE_RUN_NOT_CONNECT and MYSQL_SLAVE_NOT_RUN are reported
      as 'No' for Slave_IO_running of command SHOW SLAVE STATUS.
      
      Change MYSQL_SLAVE_RUN_NOT_CONNECT to be reported as 'Connecting'.

    M  sql/slave.cc
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2009-10-01 17:22:44 +0000
+++ b/sql/slave.cc	2009-10-02 08:07:33 +0000
@@ -1848,7 +1848,8 @@ bool show_master_info(THD* thd, Master_i
     protocol->store((ulonglong) mi->rli.group_relay_log_pos);
     protocol->store(mi->rli.group_master_log_name, &my_charset_bin);
     protocol->store(mi->slave_running == MYSQL_SLAVE_RUN_CONNECT ?
-                    "Yes" : "No", &my_charset_bin);
+                    "Yes" : (mi->slave_running == MYSQL_SLAVE_RUN_NOT_CONNECT ?
+                             "Connecting" : "No"), &my_charset_bin);
     protocol->store(mi->rli.slave_running ? "Yes":"No", &my_charset_bin);
     protocol->store(rpl_filter->get_do_db());
     protocol->store(rpl_filter->get_ignore_db());


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