From: Date: May 9 2007 12:51pm
Subject: bk commit into 5.1 tree (tomas:1.2511) BUG#27292
List-Archive: http://lists.mysql.com/commits/26366
X-Bug: 27292
Message-Id: <20070509105143.D464B3C348A@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-05-09 12:51:37+02:00, tomas@stripped +1 -0
  Bug #27292  	restarting a data node makes sql nodes log event buffer status every few seconds

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-05-09 12:51:35+02:00, tomas@stripped +11 -0
    Bug #27292  	restarting a data node makes sql nodes log event buffer status every few seconds

# 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-single-user

--- 1.116/sql/ha_ndbcluster_binlog.cc	2007-04-25 23:49:33 +02:00
+++ 1.117/sql/ha_ndbcluster_binlog.cc	2007-05-09 12:51:35 +02:00
@@ -3808,6 +3808,17 @@
       res= i_ndb->pollEvents(tot_poll_wait, &gci);
       tot_poll_wait= 0;
     }
+    else
+    {
+      /*
+        Just consume any events, not used if no binlogging
+        e.g. node failure events
+      */
+      Uint64 tmp_gci;
+      if (i_ndb->pollEvents(0, &tmp_gci))
+        while (i_ndb->nextEvent())
+          ;
+    }
     int schema_res= s_ndb->pollEvents(tot_poll_wait, &schema_gci);
     ndb_latest_received_binlog_epoch= gci;