bzr push into mysql-5.5 branch (magnus.blaudd:3090 to 3091) WL#4080

[Magnus Blåudd]

 3091 Magnus Blåudd	2010-10-20
      ndb
       - apply MCP patch for WL#4080 which need a master_epoch member variable
         in Master_info

    modified:
      sql/rpl_mi.cc
      sql/rpl_mi.h
 3090 Magnus Blåudd	2010-10-19
      ndb
       - adjust the patch for WL3126 after discovering compile problem, make the
        patch less intrusive by avoiding to define the nice union and instead use the
        "client_ip" member directly.

    modified:
      include/mysql.h
      include/mysql.h.pp
      sql-common/client.c
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2010-07-15 13:47:50 +0000
+++ b/sql/rpl_mi.cc	2010-10-20 08:32:52 +0000
@@ -50,6 +50,10 @@ Master_info::Master_info(bool is_slave_r
   mysql_cond_init(key_master_info_data_cond, &data_cond, NULL);
   mysql_cond_init(key_master_info_start_cond, &start_cond, NULL);
   mysql_cond_init(key_master_info_stop_cond, &stop_cond, NULL);
+
+#ifndef MCP_WL4080
+  master_epoch= 0;
+#endif
 }
 
 Master_info::~Master_info()

=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h	2010-06-28 22:30:32 +0000
+++ b/sql/rpl_mi.h	2010-10-20 08:32:52 +0000
@@ -112,6 +112,10 @@ class Master_info : public Slave_reporti
   ulonglong received_heartbeats;  // counter of received heartbeat events
   DYNAMIC_ARRAY ignore_server_ids;
   ulong master_id;
+
+#ifndef MCP_WL4080
+  uint64 master_epoch;
+#endif
 };
 void init_master_log_pos(Master_info* mi);
 int init_master_info(Master_info* mi, const char* master_info_fname,

No bundle (reason: useless for push emails).