From: tomas
Date: July 5 2006 3:36pm
Subject: bk commit into 5.1 tree (tomas:1.2245) BUG#20843
List-Archive: http://lists.mysql.com/commits/8766
X-Bug: 20843
Message-Id: <20060705153630.2F6097FDCD@poseidon.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
  1.2245 06/07/05 17:36:18 tomas@stripped +1 -0
  Bug #20843 tests fails randomly with assertion in completeClusterFailed

  sql/ha_ndbcluster_binlog.cc
    1.74 06/07/05 17:36:10 tomas@stripped +10 -3
    Bug #20843 tests fails randomly with assertion in completeClusterFailed

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-ndb

--- 1.73/sql/ha_ndbcluster_binlog.cc	2006-07-05 14:20:01 +02:00
+++ 1.74/sql/ha_ndbcluster_binlog.cc	2006-07-05 17:36:10 +02:00
@@ -3442,8 +3442,8 @@
     // wait for the first event
     thd->proc_info= "Waiting for first event from ndbcluster";
     DBUG_PRINT("info", ("Waiting for the first event"));
-    int schema_res= 0;
-    Uint64 schema_gci= 0;
+    int schema_res= 0, res= 0;
+    Uint64 schema_gci= 0, gci= 0;
     while (schema_res == 0 && !abort_loop)
     {
       schema_res= s_ndb->pollEvents(100, &schema_gci);
@@ -3452,7 +3452,14 @@
     DBUG_PRINT("info", ("schema_res: %d  schema_gci: %d", schema_res, schema_gci));
     if (schema_res > 0)
     {
-      i_ndb->pollEvents(0);
+      while (res >= 0 && gci < schema_gci && !abort_loop)
+      {
+        res= i_ndb->pollEvents(100, &gci);
+      }
+      if (gci > schema_gci)
+      {
+        schema_gci= gci;
+      }
       i_ndb->flushIncompleteEvents(schema_gci);
       s_ndb->flushIncompleteEvents(schema_gci);
       if (schema_gci < ndb_latest_handled_binlog_epoch)