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

fixed bug, submitted to fb-devel by Cosmin Popa <cosmin@aplix.ro>

Browse Source 
after execution of pre-(update/delete) triggers, non-existent deadlock
was raised, conflict was with version, created by current transaction
This commit is contained in:
alexpeshkoff 2003-06-18 08:08:07 +00:00
parent 76ff0b954f
commit 188e9e5d03
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/jrd/vio.cpp
View File

@ -1159,31 +1159,7 @@ void VIO_erase(TDBB tdbb, RPB * rpb, JRD_TRA transaction)
if (rpb->rpb_stream_flags & RPB_s_refetch)
{
tid_fetch = rpb->rpb_transaction;
if ((!DPM_get(tdbb, rpb, LCK_read)) ||
(!VIO_chase_record_version(tdbb,
rpb,
NULL,
transaction,
reinterpret_cast<blk*>(
tdbb->tdbb_default),FALSE)))
{
ERR_post(isc_deadlock, isc_arg_gds, isc_update_conflict, 0);
}
VIO_data(tdbb, rpb,
reinterpret_cast<blk*>(tdbb->tdbb_request->req_pool));
/* If record is present, and the transaction is read committed,
* make sure the record has not been updated. Also, punt after
* VIO_data () call which will release the page.
*/
if ((transaction->tra_flags & TRA_read_committed) &&
(tid_fetch != rpb->rpb_transaction))
{
ERR_post(isc_deadlock, isc_arg_gds, isc_update_conflict, 0);
}
RefetchRecord(tdbb, rpb, transaction);
rpb->rpb_stream_flags &= ~RPB_s_refetch;
}
@ -1980,8 +1956,9 @@ static void RefetchRecord(TDBB tdbb, RPB * rpb, JRD_TRA transaction)
(!VIO_chase_record_version
(tdbb, rpb, NULL, transaction,
reinterpret_cast < blk * >(tdbb->tdbb_default),
FALSE)))
FALSE))) {
ERR_post(isc_deadlock, isc_arg_gds, isc_update_conflict, 0);
}
VIO_data(tdbb, rpb,
reinterpret_cast < blk * >(tdbb->tdbb_request->req_pool));
@ -1990,8 +1967,12 @@ static void RefetchRecord(TDBB tdbb, RPB * rpb, JRD_TRA transaction)
* VIO_data () call which will release the page.
*/
if ((transaction->tra_flags & TRA_read_committed) &&
(tid_fetch != rpb->rpb_transaction))
(tid_fetch != rpb->rpb_transaction) &&
// added to check that it was not current transcation,
// who modified the record. Alex P, 18-Jun-03
(rpb->rpb_transaction != transaction->tra_number)) {
ERR_post(isc_deadlock, isc_arg_gds, isc_update_conflict, 0);
}
}
void VIO_modify(TDBB tdbb, RPB * org_rpb, RPB * new_rpb, JRD_TRA transaction)