diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-05-22 20:39:53 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-05-22 20:39:53 +0200 |
| commit | b0add081a43c8fe8aeb0f366a1986126a4bbd72a (patch) | |
| tree | 80e5884576496e94cce2942f2fa7f39445990c2c /storage/ndb/src/kernel/blocks/dbacc | |
| parent | 3283735a2a5d3a32abc7e2aca730c81dd4e710be (diff) | |
| download | mariadb-git-b0add081a43c8fe8aeb0f366a1986126a4bbd72a.tar.gz | |
ndb - dbacc
remove too strong assertion
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
remove too strong assertion
Diffstat (limited to 'storage/ndb/src/kernel/blocks/dbacc')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index 4ee8a91f611..18decbf0238 100644 --- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -1688,21 +1688,6 @@ Dbacc::validate_lock_queue(OperationrecPtr opPtr) } } - bool exists = true; - switch (loPtr.p->m_op_bits & Operationrec::OP_MASK){ - case ZREAD: - case ZINSERT: - case ZUPDATE: - case ZSCAN_OP: - exists = true; - break; - case ZDELETE: - exists = false; - break; - case ZWRITE: - vlqrequire(false); - } - // Validate parallel queue { bool many = false; @@ -1754,26 +1739,6 @@ Dbacc::validate_lock_queue(OperationrecPtr opPtr) { vlqrequire(orlockmode == 0); } - - if (opstate == Operationrec::OP_STATE_RUNNING || - opstate == Operationrec::OP_STATE_EXECUTED) - { - switch (lastP.p->m_op_bits & Operationrec::OP_MASK){ - case ZREAD: - case ZUPDATE: - case ZSCAN_OP: - vlqrequire(exists); - break; - case ZDELETE: - vlqrequire(exists); - exists = false; - break; - case ZINSERT: - vlqrequire(!exists); - exists = true; - break; - } - } } if (lastP.i != loPtr.i) |