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

Go back to using isc_deadlock error code - for compatibility with existing software

Browse Source
This commit is contained in:
nikolay.samofatov 2019-08-12 10:56:17 +03:00
parent 87e720b918
commit 230e6df4b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jrd/vio.cpp
View File

@ -5808,7 +5808,8 @@ static int prepare_update( thread_db* tdbb,
{ {
tdbb->bumpRelStats(RuntimeStatistics::RECORD_CONFLICTS, relation->rel_id); tdbb->bumpRelStats(RuntimeStatistics::RECORD_CONFLICTS, relation->rel_id);
ERR_post(Arg::Gds(isc_update_conflict) << ERR_post(Arg::Gds(isc_deadlock) <<
Arg::Gds(isc_update_conflict) <<
Arg::Gds(isc_concurrent_transaction) << Arg::Num(update_conflict_trans)); Arg::Gds(isc_concurrent_transaction) << Arg::Num(update_conflict_trans));
} }
return PREPARE_CONFLICT; return PREPARE_CONFLICT;