bzr push into mysql-6.0-rpl branch (alfranio.correia:2815 to 2816) Bug#40337

[Alfranio Correia]

 2816 Alfranio Correia	2009-02-19
      Post-fix for BUG#40337.
modified:
  sql/rpl_mi.cc

 2815 Alfranio Correia	2009-02-17 [merge]
      auto-merge.
added:
  mysql-test/suite/rpl/r/rpl_sync.result
  mysql-test/suite/rpl/t/rpl_sync-slave.opt
  mysql-test/suite/rpl/t/rpl_sync.test
modified:
  mysql-test/suite/rpl/r/rpl_flushlog_loop.result
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/rpl_mi.cc
  sql/rpl_mi.h
  sql/rpl_rli.cc
  sql/rpl_rli.h
  sql/slave.cc
  sql/sql_binlog.cc
  sql/sql_repl.cc

=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2009-02-17 23:06:00 +0000
+++ b/sql/rpl_mi.cc	2009-02-19 08:54:07 +0000
@@ -32,12 +32,12 @@ int init_dynarray_intvar_from_file(DYNAM
 
 Master_info::Master_info(bool is_slave_recovery)
   :Slave_reporting_capability("I/O"),
-   ssl(0), ssl_verify_server_cert(0), fd(-1),  io_thd(0), port(MYSQL_PORT),
+   ssl(0), ssl_verify_server_cert(0), fd(-1),  io_thd(0), 
+   rli(is_slave_recovery), port(MYSQL_PORT),
    connect_retry(DEFAULT_CONNECT_RETRY), heartbeat_period(0),
    received_heartbeats(0), inited(0), master_id(0),
    abort_slave(0), slave_running(0), slave_run_id(0),
-   sync_counter(0),
-   rli(is_slave_recovery) 
+   sync_counter(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;