bk commit into 6.0 tree (kaa:1.2572) BUG#31326

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
6.0 repository of kaa.  When kaa 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-18 14:38:59+03:00, kaa@kaamos.(none) +1 -0
  Initialization order cleanups to get rid of warnings from the 
  -Wreorder option added by the patch for bug#31326.

  sql/rpl_mi.cc@stripped, 2008-02-18 14:38:57+03:00, kaa@kaamos.(none) +3 -3
    Initialization order cleanups to get rid of warnings from the 
    -Wreorder option added by the patch for bug#31326.

diff -Nrup a/sql/rpl_mi.cc b/sql/rpl_mi.cc
--- a/sql/rpl_mi.cc	2008-02-17 16:54:03 +03:00
+++ b/sql/rpl_mi.cc	2008-02-18 14:38:57 +03:00
@@ -32,9 +32,9 @@ int init_floatvar_from_file(float* var, 
 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),
-   slave_running(0), slave_run_id(0),
-   heartbeat_period(0), received_heartbeats(0)
+   connect_retry(DEFAULT_CONNECT_RETRY), heartbeat_period(0),
+   received_heartbeats(0), inited(0),
+   abort_slave(0), slave_running(0), slave_run_id(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;