From d588ef9b550e35976c2ba0428cf6dcfa3f0de3cf Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Thu, 2 Feb 2006 15:53:44 +0100
Subject: [PATCH 1/2] disabled test because of bug, bug assigned and being
 worked on

---
 mysql-test/t/disabled.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index b66fa869eb0..4007fdf406e 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -33,5 +33,6 @@ system_mysql_db : Needs fixing
 system_mysql_db_fix : Needs fixing
 #ndb_alter_table_row : sometimes wrong error 1015!=1046
 ndb_gis : garbled msgs from corrupt THD*
+ndb_binlog_ddl_multi : Bug #17038
 
 # vim: set filetype=conf:

From eaf466d26a4b84803998bbbb0f6454b6f4e258fd Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Thu, 2 Feb 2006 16:12:18 +0100
Subject: [PATCH 2/2] added more logging in ndb handler     enable extra
 logging in ndb handler during test runs

mysql-test/mysql-test-run.pl:
  enable extra logging in ndb handler during test runs
sql/ha_ndbcluster_binlog.cc:
  added more logging in ndb handler
---
 mysql-test/mysql-test-run.pl |  2 ++
 sql/ha_ndbcluster_binlog.cc  | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index a14272eb164..82b894c28af 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2316,6 +2316,7 @@ sub mysqld_arguments ($$$$$$) {
       mtr_add_arg($args, "%s--ndbcluster", $prefix);
       mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
                   $opt_ndbconnectstring);
+      mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
     }
   }
 
@@ -2383,6 +2384,7 @@ sub mysqld_arguments ($$$$$$) {
       mtr_add_arg($args, "%s--ndbcluster", $prefix);
       mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
                   $opt_ndbconnectstring_slave);
+      mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);
     }
   } # end slave
 
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 5a8ff8cb338..8d1c7d6cc4b 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -1464,6 +1464,14 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
       (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;
@@ -1476,6 +1484,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
       (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;
@@ -1488,6 +1505,15 @@ ndb_binlog_thread_handle_schema_event(THD *thd, Ndb *ndb,
       (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;