bk commit into 5.1 tree (gni:1.2662) BUG#28988

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni.  When gni 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, 2008-04-24 16:51:18+08:00, gni@stripped +1 -0
  BUG#28988 ndb_alter_table: assert failure (assert(op->m_node_bit_mask.isclear())

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2008-04-24 16:51:10+08:00, gni@stripped +24 -0
    _TE_NODE_FAILUER should deal with clearing of 0 bit(means cluster connection),
    just like _TE_STOP

diff -Nrup a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-12-11 23:04:31 +08:00
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-04-24 16:51:10 +08:00
@@ -1844,10 +1844,34 @@ NdbEventBuffer::insertDataL(NdbEventOper
     {
     case NdbDictionary::Event::_TE_NODE_FAILURE:
       DBUG_ASSERT(op->m_node_bit_mask.get(0u) != 0);
+      op->m_node_bit_mask.clear(0u);
       op->m_node_bit_mask.clear(SubTableData::getNdbdNodeId(ri));
       DBUG_PRINT("info",
                  ("_TE_NODE_FAILURE: m_ref_count: %u for op: %p id: %u",
                   op->m_ref_count, op, SubTableData::getNdbdNodeId(ri)));
+      if (op->m_node_bit_mask.isclear())
+      {
+        DBUG_ASSERT(op->m_ref_count > 0);
+        // remove kernel reference
+        // added in execute_no_lock
+        op->m_ref_count--;
+        DBUG_PRINT("info", ("_TE_STOP: m_ref_count: %u for op: %p",
+                            op->m_ref_count, op));
+        if (op->theMainOp)
+        {
+          DBUG_ASSERT(op->m_ref_count == 0);
+          DBUG_ASSERT(op->theMainOp->m_ref_count > 0);
+          // remove blob reference in main op
+          // added in execute_no_lock
+          op->theMainOp->m_ref_count--;
+          DBUG_PRINT("info", ("m_ref_count: %u for op: %p",
+                              op->theMainOp->m_ref_count, op->theMainOp));
+        }
+      }
+      else
+      {
+        op->m_node_bit_mask.set(0u);
+      }
       break;
     case NdbDictionary::Event::_TE_ACTIVE:
       DBUG_ASSERT(op->m_node_bit_mask.get(0u) != 0);