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

Complementary patch for one of my prior commits (forced rollbacks should go through the TIP).

Browse Source
This commit is contained in:
dimitr 2013-11-13 15:39:32 +00:00
parent fe23598a23
commit 489480b774
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/jrd.cpp
View File

@ -6579,16 +6579,14 @@ void JTransaction::freeEngineData(IStatus* user_status)
try
{
if (transaction->tra_flags & TRA_prepared ||
tdbb->getDatabase()->dbb_ast_flags & DBB_shutdown ||
tdbb->getAttachment()->att_flags & ATT_shutdown)
if (transaction->tra_flags & TRA_prepared)
{
TraceTransactionEnd trace(transaction, false, false);
EDS::Transaction::jrdTransactionEnd(tdbb, transaction, false, false, false);
TRA_release_transaction(tdbb, transaction, &trace);
}
else
TRA_rollback(tdbb, transaction, false, false);
TRA_rollback(tdbb, transaction, false, true);
transaction = NULL;
}