bzr commit into mysql-trunk-telco-7.0 branch (magnus.blaudd:3211) WL#4080

[Magnus Blåudd]

#At file:///home/msvensson/mysql/trunk-telco-7.0/ based on revid:magnus.blaudd@stripped7zcbmgg

 3211 Magnus Blåudd	2011-01-14
      ndb
       - add MCP patch for WL#4080 to trunk-telco-7.0

    modified:
      sql/rpl_mi.cc
      sql/rpl_mi.h
=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2010-11-30 10:43:53 +0000
+++ b/sql/rpl_mi.cc	2011-01-14 14:21:03 +0000
@@ -96,6 +96,11 @@ Master_info::Master_info(PSI_mutex_key *
   ssl_cipher[0]= 0; ssl_key[0]= 0;
   master_uuid[0]= 0;
   ignore_server_ids= new Server_ids();
+
+#ifndef MCP_WL4080
+  master_epoch= 0;
+#endif
+
 }
 
 Master_info::~Master_info()

=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h	2010-11-30 10:43:53 +0000
+++ b/sql/rpl_mi.h	2011-01-14 14:21:03 +0000
@@ -98,6 +98,10 @@ class Master_info : public Rpl_info
   ulonglong received_heartbeats;  // counter of received heartbeat events
   Server_ids *ignore_server_ids;
   ulong master_id;
+
+#ifndef MCP_WL4080
+  uint64 master_epoch;
+#endif
   /*
     to hold checksum alg in use until IO thread has received FD.
     Initialized to novalue, then set to the queried from master

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