bk commit into 5.1 tree (tomas:1.2612) BUG#30598

[tomas]

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-08-23 16:49:26+02:00, tomas@stripped +1 -0
  Bug #30598  	using multi connect for cluster may cause double handeling of ddl
statements

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-08-23 16:49:23+02:00,
tomas@stripped +12 -2
    Bug #30598  	using multi connect for cluster may cause double handeling of ddl
statements

# 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-telco-6.2

--- 1.129/sql/ha_ndbcluster_binlog.cc	2007-08-20 18:10:13 +02:00
+++ 1.130/sql/ha_ndbcluster_binlog.cc	2007-08-23 16:49:23 +02:00
@@ -165,6 +165,17 @@
   }
 }
 
+static int has_node_id(uint id)
+{
+  unsigned i;
+  for (i= 0; i < g_ndb_cluster_connection_pool_alloc; i++)
+  {
+    if (id == g_ndb_cluster_connection_pool[i]->node_id())
+      return 1;
+  }
+  return 0;
+}
+
 #ifndef DBUG_OFF
 /* purecov: begin deadcode */
 static void print_records(TABLE *table, const char *record)
@@ -1688,8 +1699,7 @@
   bool do_close_cached_tables= FALSE;
   bool is_online_alter_table= FALSE;
   bool is_rename_table= FALSE;
-  bool is_remote_change=
-    (uint) pOp->getReqNodeId() != g_ndb_cluster_connection->node_id();
+  bool is_remote_change= !has_node_id(pOp->getReqNodeId());
 
   if (pOp->getEventType() == NDBEVENT::TE_ALTER)
   {