diff options
| author | unknown <joreland@mysql.com> | 2005-02-01 17:16:05 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-01 17:16:05 +0100 |
| commit | 6b7f067e8b3285ea63160512d1c0dcf1ce553865 (patch) | |
| tree | 7ca4c58c6b2cf379c9ff17aab9497e05047dee15 /ndb/src | |
| parent | 514b2364b4156e23fb15f4506a50877011b9c7ef (diff) | |
| parent | 9d548d7f2253ea5dd1f78960f61ba2f0822db177 (diff) | |
| download | mariadb-git-6b7f067e8b3285ea63160512d1c0dcf1ce553865.tar.gz | |
merge
Diffstat (limited to 'ndb/src')
| -rw-r--r-- | ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index 5c7cc597672..a82c96beebd 100644 --- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -5704,7 +5704,8 @@ void Dbacc::commitOperation(Signal* signal) Uint32 tmp2Olq; if ((operationRecPtr.p->commitDeleteCheckFlag == ZFALSE) && - (operationRecPtr.p->operation != ZSCAN_OP)) { + (operationRecPtr.p->operation != ZSCAN_OP) && + (operationRecPtr.p->operation != ZREAD)) { jam(); /* This method is used to check whether the end result of the transaction will be to delete the tuple. In this case all operation will be marked |