Commit 9bfd0791 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents 0848f193 e74278ce

storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+0 −1
Original line number Diff line number Diff line
@@ -3210,7 +3210,6 @@ Dbacc::readTablePk(Uint32 localkey1, Uint32 eh, Ptr<Operationrec> opPtr) 
    {

      dump_lock_queue(opPtr);

      ndbrequire(opPtr.p->nextParallelQue == RNIL);

      ndbrequire(opPtr.p->nextSerialQue == RNIL);

      ndbrequire(opPtr.p->m_op_bits & Operationrec::OP_ELEMENT_DISAPPEARED);

      ndbrequire(opPtr.p->m_op_bits & Operationrec::OP_COMMIT_DELETE_CHECK);

      ndbrequire((opPtr.p->m_op_bits & Operationrec::OP_STATE_MASK) == Operationrec::OP_STATE_RUNNING);