bk commit into 5.1 tree (pekka:1.2074)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2074 06/01/22 10:37:57 pekka@stripped +1 -0
  ndb - wl#2972 injector saw blob table drop event => crash

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.35 06/01/22 10:33:25 pekka@stripped +12 -2
    catch non-data events on blob part tables

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-rbr

--- 1.34/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-21 11:56:55 +01:00
+++ 1.35/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-22 10:33:25 +01:00
@@ -942,6 +942,9 @@
     NdbEventOperationImpl *op= data->m_event_op;
     DBUG_PRINT_EVENT("info", ("available data=%p op=%p", data, op));
 
+    // blob table ops must not be seen at this level
+    assert(op->theMainOp == NULL);
+
     // set NdbEventOperation data
     op->m_data_item= data;
 
@@ -1378,10 +1381,18 @@
       DBUG_RETURN_EVENT(0);
     }
 
+    const bool is_blob_event = (op->theMainOp != NULL);
     const bool is_data_event =
       sdata->operation < NdbDictionary::Event::_TE_FIRST_NON_DATA_EVENT;
     const bool use_hash =  op->m_mergeEvents && is_data_event;
 
+    if (! is_data_event && is_blob_event)
+    {
+      // currently subscribed to but not used
+      DBUG_PRINT_EVENT("info", ("ignore non-data event on blob table"));
+      DBUG_RETURN_EVENT(0);
+    }
+
     // find position in bucket hash table
     EventBufData* data = 0;
     EventBufData_hash::Pos hpos;
@@ -1400,14 +1411,13 @@
         op->m_has_error = 2;
         DBUG_RETURN_EVENT(-1);
       }
-
       if (unlikely(copy_data(sdata, ptr, data)))
       {
         op->m_has_error = 3;
         DBUG_RETURN_EVENT(-1);
       }
       data->m_event_op = op;
-      if (op->theMainOp == NULL || ! is_data_event)
+      if (! is_blob_event || ! is_data_event)
       {
         bucket->m_data.append(data);
       }