Commit cca1a6a4 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
parents fae72af5 f8c69117

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+9 −0
Original line number Diff line number Diff line
@@ -13732,6 +13732,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;