From: Date: April 3 2007 2:31pm
Subject: bk commit into 5.1 tree (tomas:1.2543) BUG#21494
List-Archive: http://lists.mysql.com/commits/23665
X-Bug: 21494
Message-Id: <20070403123152.23DD030861E@whalegate.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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, 2007-04-03 14:31:46+02:00, tomas@stripped +3 -0
  Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
  - insert gap event on cluster connect

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-04-03 14:31:43+02:00, tomas@stripped +8 -0
    Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
    - insert gap event on cluster connect

  sql/rpl_injector.cc@stripped, 2007-04-03 14:31:43+02:00, tomas@stripped +1 -1
    Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
    - insert gap event on cluster connect

  sql/rpl_injector.h@stripped, 2007-04-03 14:31:43+02:00, tomas@stripped +1 -1
    Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data
    - insert gap event on cluster connect

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.108/sql/ha_ndbcluster_binlog.cc	2007-04-03 12:57:14 +02:00
+++ 1.109/sql/ha_ndbcluster_binlog.cc	2007-04-03 14:31:43 +02:00
@@ -3590,6 +3590,14 @@
     Main NDB Injector loop
   */
   {
+    /*
+      Always insert a GAP event as we cannot know what has happened in the cluster
+      while not being connected.
+    */
+    LEX_STRING const msg= { C_STRING_WITH_LEN("Cluster connect") };
+    inj->record_incident(thd, INCIDENT_LOST_EVENTS, msg);
+  }
+  {
     thd->proc_info= "Waiting for ndbcluster to start";
 
     pthread_mutex_lock(&injector_mutex);

--- 1.9/sql/rpl_injector.cc	2007-03-29 20:31:04 +02:00
+++ 1.10/sql/rpl_injector.cc	2007-04-03 14:31:43 +02:00
@@ -198,7 +198,7 @@
   return 0;
 }
 
-int injector::record_incident(THD *thd, Incident incident, LEX_STRING message)
+int injector::record_incident(THD *thd, Incident incident, LEX_STRING const message)
 {
   Incident_log_event ev(thd, incident, message);
   if (int error= mysql_bin_log.write(&ev))

--- 1.10/sql/rpl_injector.h	2007-03-29 20:51:46 +02:00
+++ 1.11/sql/rpl_injector.h	2007-04-03 14:31:43 +02:00
@@ -324,7 +324,7 @@
     void        new_trans(THD *, transaction *);
 
     int record_incident(THD*, Incident incident);
-    int record_incident(THD*, Incident incident, LEX_STRING message);
+    int record_incident(THD*, Incident incident, LEX_STRING const message);
 
 private:
     explicit injector();