mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

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


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
This commit is contained in:
unknown 2008-02-03 14:14:32 +01:00
commit 6bb77bf6bb
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file

@ -3210,7 +3210,6 @@ Dbacc::readTablePk(Uint32 localkey1, Uint32 eh, Ptr<Operationrec> opPtr)
{ {
dump_lock_queue(opPtr); dump_lock_queue(opPtr);
ndbrequire(opPtr.p->nextParallelQue == RNIL); 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_ELEMENT_DISAPPEARED);
ndbrequire(opPtr.p->m_op_bits & Operationrec::OP_COMMIT_DELETE_CHECK); 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); ndbrequire((opPtr.p->m_op_bits & Operationrec::OP_STATE_MASK) == Operationrec::OP_STATE_RUNNING);