bk commit into 5.1 tree (tomas:1.2127)

[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
  1.2127 06/02/02 16:44:22 tomas@stripped +2 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
  into  poseidon.ndb.mysql.com:/home/tomas/mysql51

  sql/ha_ndbcluster_binlog.cc
    1.12 06/02/02 16:44:15 tomas@stripped +0 -0
    Auto merged

  mysql-test/t/disabled.def
    1.55 06/02/02 16:44:15 tomas@stripped +0 -1
    Auto merged

# 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/mysql51/RESYNC

--- 1.11/sql/ha_ndbcluster_binlog.cc	2006-02-02 11:13:28 +01:00
+++ 1.12/sql/ha_ndbcluster_binlog.cc	2006-02-02 16:44:15 +01:00
@@ -1470,6 +1470,14 @@
       (void) pthread_mutex_lock(&share->mutex);
       bitmap_clear_all(&share->subscriber_bitmap[node_id]);
       DBUG_PRINT("info",("NODE_FAILURE UNSUBSCRIBE[%d]", node_id));
+      if (ndb_extra_logging)
+      {
+        sql_print_information("NDB Binlog: Node: %d, down,"
+                              " Subscriber bitmask %x%x",
+                              pOp->getNdbdNodeId(),
+                              share->subscriber_bitmap[node_id].bitmap[1],
+                              share->subscriber_bitmap[node_id].bitmap[0]);
+      }
       (void) pthread_mutex_unlock(&share->mutex);
       (void) pthread_cond_signal(&injector_cond);
       break;
@@ -1482,6 +1490,15 @@
       (void) pthread_mutex_lock(&share->mutex);
       bitmap_set_bit(&share->subscriber_bitmap[node_id], req_id);
       DBUG_PRINT("info",("SUBSCRIBE[%d] %d", node_id, req_id));
+      if (ndb_extra_logging)
+      {
+        sql_print_information("NDB Binlog: Node: %d, subscribe from node %d,"
+                              " Subscriber bitmask %x%x",
+                              pOp->getNdbdNodeId(),
+                              req_id,
+                              share->subscriber_bitmap[node_id].bitmap[1],
+                              share->subscriber_bitmap[node_id].bitmap[0]);
+      }
       (void) pthread_mutex_unlock(&share->mutex);
       (void) pthread_cond_signal(&injector_cond);
       break;
@@ -1494,6 +1511,15 @@
       (void) pthread_mutex_lock(&share->mutex);
       bitmap_clear_bit(&share->subscriber_bitmap[node_id], req_id);
       DBUG_PRINT("info",("UNSUBSCRIBE[%d] %d", node_id, req_id));
+      if (ndb_extra_logging)
+      {
+        sql_print_information("NDB Binlog: Node: %d, unsubscribe from node %d,"
+                              " Subscriber bitmask %x%x",
+                              pOp->getNdbdNodeId(),
+                              req_id,
+                              share->subscriber_bitmap[node_id].bitmap[1],
+                              share->subscriber_bitmap[node_id].bitmap[0]);
+      }
       (void) pthread_mutex_unlock(&share->mutex);
       (void) pthread_cond_signal(&injector_cond);
       break;