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

Fixed 2.5.3 regression, introduced by one of my previous commits - deadlock when starting transaction using SQL operator

Browse Source
This commit is contained in:
alexpeshkoff 2013-09-12 06:47:20 +00:00
parent f3df48ef36
commit a88d6444cb
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jrd/jrd.cpp
View File

@ -7115,6 +7115,8 @@ void JRD_start_multiple(thread_db* tdbb, jrd_tra** tra_handle, USHORT count, TEB
jrd_tra* prior = NULL;
jrd_tra* transaction = NULL;
Database* currentDatabase = tdbb->getDatabase();
try
{
if (*tra_handle)
@ -7132,13 +7134,14 @@ void JRD_start_multiple(thread_db* tdbb, jrd_tra** tra_handle, USHORT count, TEB
for (TEB* v = vector; v < vector + count; v++)
{
tdbb->setDatabase(NULL);
tdbb->setAttachment(NULL);
AttachmentHolder attHolder(tdbb, *v->teb_database, "JRD_start_multiple");
Attachment* attachment = *v->teb_database;
AttachmentHolder attHolder(tdbb, attachment, "JRD_start_multiple");
DatabaseContextHolder dbbHolder(tdbb);
check_database(tdbb);
AutoPtr<DatabaseContextHolder> dbbHolder;
if (tdbb->getDatabase() != currentDatabase)
{
dbbHolder = new DatabaseContextHolder(tdbb);
check_database(tdbb);
}
try
{
@ -7171,14 +7174,17 @@ void JRD_start_multiple(thread_db* tdbb, jrd_tra** tra_handle, USHORT count, TEB
if (prior)
{
ThreadStatusGuard temp_status(tdbb);
tdbb->setDatabase(NULL);
tdbb->setAttachment(NULL);
try
{
AttachmentHolder attHolder(tdbb, prior->tra_attachment, "JRD_start_multiple - 2");
DatabaseContextHolder dbbHolder(tdbb);
check_database(tdbb);
AutoPtr<DatabaseContextHolder> dbbHolder;
if (tdbb->getDatabase() != currentDatabase)
{
dbbHolder = new DatabaseContextHolder(tdbb);
check_database(tdbb);
}
rollback(tdbb, prior, false);
}