bk commit into 5.0 tree (jonas:1.2276) BUG#24752

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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, 2006-12-01 13:57:29+01:00, jonas@stripped +1 -0
  ndb - bug#24752
    This prevent any subsequent node restarts, but it's better than crashing an alive node

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-12-01 13:57:28+01:00,
jonas@stripped +9 -0
    Fix for bug#24752
    This prevent any subsequent node restarts, but it's better than crashing an alive node

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.67/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-12-01 13:57:33 +01:00
+++ 1.68/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-12-01 13:57:33 +01:00
@@ -10156,6 +10156,15 @@
       break;
     }
 
+    if (c_blockState != BS_IDLE)
+    {
+      /**
+       * If state is BS_NODE_FAILURE, it might be that no op is running
+       */
+      jam();
+      break;
+    }
+
     ndbrequire(c_blockState == BS_IDLE);
     lockPtr.p->locked = true;
     c_blockState = lockPtr.p->lt->blockState;