diff options
| author | jonas@perch.ndb.mysql.com <> | 2008-02-03 14:14:32 +0100 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2008-02-03 14:14:32 +0100 |
| commit | 9bfd07917e7c3d70da4ab63150ebdc8ed0426408 (patch) | |
| tree | 39cb2a88dfd365d2f663e9ba94616314e5861b62 /storage/ndb | |
| parent | 0848f193ade8ec89d58cfab63e8df1b0b158230e (diff) | |
| parent | e74278ce61bf1d826c543b54b3f1bde8f9741e10 (diff) | |
| download | mariadb-git-9bfd07917e7c3d70da4ab63150ebdc8ed0426408.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index 63d22bd0a37..1805d6ef4f8 100644 --- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -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); |