bk commit into 5.1 tree (tomas:1.2318)

[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.2318 06/04/13 09:37:43 tomas@stripped +1 -0
  wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup

  sql/ha_ndbcluster_binlog.cc
    1.44 06/04/13 09:37:37 tomas@stripped +8 -5
    wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup

# 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-new

--- 1.43/sql/ha_ndbcluster_binlog.cc	2006-04-12 18:01:11 +02:00
+++ 1.44/sql/ha_ndbcluster_binlog.cc	2006-04-13 09:37:37 +02:00
@@ -1257,7 +1257,7 @@
         max_timeout--;
         if (max_timeout == 0)
         {
-          sql_print_error("NDB %s: distibuting %s timed out. Ignoring...",
+          sql_print_error("NDB %s: distributing %s timed out. Ignoring...",
                           type_str, ndb_schema_object->key);
           break;
         }
@@ -1566,9 +1566,9 @@
 
   share= 0;
   pOp->setCustomData(0);
-          
+
   pthread_mutex_lock(&injector_mutex);
-  injector_ndb->dropEventOperation(pOp);
+  ndb->dropEventOperation(pOp);
   pOp= 0;
   pthread_mutex_unlock(&injector_mutex);
 
@@ -2648,7 +2648,8 @@
       max_timeout--;
       if (max_timeout == 0)
       {
-        sql_print_error("NDB %s: timed out. Ignoring...", type_str);
+        sql_print_error("NDB %s: %s timed out. Ignoring...",
+                        type_str, share->key);
         break;
       }
       if (ndb_extra_logging)
@@ -3273,7 +3274,7 @@
       while (pOp != NULL)
       {
         if (!pOp->hasError())
-          ndb_binlog_thread_handle_schema_event(thd, schema_ndb, pOp,
+          ndb_binlog_thread_handle_schema_event(thd, s_ndb, pOp,
                                                 &post_epoch_log_list,
                                                 &post_epoch_unlock_list,
                                                 &mem_root);
@@ -3533,6 +3534,7 @@
       DBUG_PRINT("info",("removing event operation on %s",
                          op->getEvent()->getName()));
       NDB_SHARE *share= (NDB_SHARE*) op->getCustomData();
+      DBUG_ASSERT(share != 0);
       DBUG_ASSERT(share->op == op ||
                   share->op_old == op);
       share->op= share->op_old= 0;
@@ -3552,6 +3554,7 @@
       DBUG_PRINT("info",("removing event operation on %s",
                          op->getEvent()->getName()));
       NDB_SHARE *share= (NDB_SHARE*) op->getCustomData();
+      DBUG_ASSERT(share != 0);
       DBUG_ASSERT(share->op == op ||
                   share->op_old == op);
       share->op= share->op_old= 0;