bk commit into 6.0 tree (gkodinov:1.2800)

[kgeorge]

Below is the list of changes that have just been committed into a local
6.0 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-05 18:20:15+02:00, gkodinov@stripped +1 -0
  Fixed the merge of bug 31326 to 6.0-opt

  sql/rpl_mi.cc@stripped, 2008-02-05 18:20:14+02:00, gkodinov@stripped +2 -1
    Fixed the merge of bug 31326 to 6.0-opt

diff -Nrup a/sql/rpl_mi.cc b/sql/rpl_mi.cc
--- a/sql/rpl_mi.cc	2008-01-30 14:44:13 +02:00
+++ b/sql/rpl_mi.cc	2008-02-05 18:20:14 +02:00
@@ -31,7 +31,8 @@ int init_strvar_from_file(char *var, int
 Master_info::Master_info()
   :Slave_reporting_capability("I/O"),
    ssl(0), ssl_verify_server_cert(0), fd(-1),  io_thd(0), port(MYSQL_PORT),
-   connect_retry(DEFAULT_CONNECT_RETRY), inited(0), abort_slave(0)
+   connect_retry(DEFAULT_CONNECT_RETRY), inited(0), abort_slave(0),
+   slave_running(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;