firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-25 01:23:03 +01:00
Code Issues

Fix conflict error during refetch found by Vlad

Browse Source
This commit is contained in:
nikolay.samofatov 2019-10-31 17:21:09 +03:00
parent 0206dd99a9
commit d9ce719ef7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dsql/StmtNodes.cpp
View File

@ -2655,6 +2655,8 @@ const StmtNode* EraseNode::erase(thread_db* tdbb, jrd_req* request, WhichTrigger
// Gently ignore this situation and proceed further.
if (!VIO_refetch_record(tdbb, rpb, transaction, true, true))
return parentStmt;
rpb->rpb_runtime_flags &= ~RPB_refetch;
}
REPL_erase(tdbb, rpb, transaction);
}
@ -6470,6 +6472,8 @@ const StmtNode* ModifyNode::modify(thread_db* tdbb, jrd_req* request, WhichTrigg
// Gently ignore this situation and proceed further.
if (!VIO_refetch_record(tdbb, orgRpb, transaction, true, true))
return parentStmt;
orgRpb->rpb_runtime_flags &= ~RPB_refetch;
}
IDX_modify(tdbb, orgRpb, newRpb, transaction);
REPL_modify(tdbb, orgRpb, newRpb, transaction);