Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-12-01 14:05:41 +01:00 · 2006-12-01 14:05:41 +01:00 · d19c93e900
commit d19c93e900
parent 115643aab5 76bdda5523
1 changed files with 9 additions and 0 deletions
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@ -10184,6 +10184,15 @@ Dbdict::checkDictLockQueue(Signal* signal, bool poll)
      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;