bk commit into 5.1 tree (jonas:1.2361) BUG#25329

[jonas]

Below is the list of changes that have just been committed into a local
5.1 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, 2007-01-04 11:13:19+01:00, jonas@stripped +1 -0
  ndb - bug#25329
    extra sledge hammer, (real 51)
    use dicklock to prevent SUB_START_REQ during node recovery

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-01-04 11:13:17+01:00,
jonas@stripped +11 -0
    use dicklock to prevent SUB_START_REQ during node recovery

# 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/51-work

--- 1.111/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-01-04 11:13:24 +01:00
+++ 1.112/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2007-01-04 11:13:24 +01:00
@@ -10050,9 +10050,20 @@
   }
   OpSubEventPtr subbPtr;
   Uint32 errCode = 0;
+
+  DictLockPtr loopPtr;
+  if (c_dictLockQueue.first(loopPtr) &&
+      loopPtr.p->lt->lockType == DictLockReq::NodeRestartLock)
+  {
+    jam();
+    errCode = 1405;
+    goto busy;
+  }
+
   if (!c_opSubEvent.seize(subbPtr)) {
     errCode = SubStartRef::Busy;
 busy:
+    jam();
     SubStartRef * ref = (SubStartRef *)signal->getDataPtrSend();
 
     { // fix