Skip to content

Fixed bug #9136 : Deadlock in Classic Server with self-security database and ON CONNECT trigger that access some MON$ table(s) is possible #9137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hvlad wants to merge 1 commit into
base: v5.0-release
Choose a base branch
from
+11 −5
Open

Fixed bug #9136 : Deadlock in Classic Server with self-security database and ON CONNECT trigger that access some MON$ table(s) is possible #9137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/jrd/dfw.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2578,7 +2578,7 @@ static bool store_view_context_type(thread_db* tdbb, SSHORT phase, DeferredWork*
}


static bool user_management(thread_db* /*tdbb*/, SSHORT phase, DeferredWork* work, jrd_tra* transaction)
static bool user_management(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_tra* transaction)
{
/**************************************
*
Expand All @@ -2597,12 +2597,18 @@ static bool user_management(thread_db* /*tdbb*/, SSHORT phase, DeferredWork* wor
return true;

case 3:
transaction->getUserManagement()->execute(work->dfw_id);
return true;
{
EngineCheckout cout(tdbb, FB_FUNCTION);
transaction->getUserManagement()->execute(work->dfw_id);
return true;
}

case 4:
transaction->getUserManagement()->commit(); // safe to be called multiple times
break;
{
EngineCheckout cout(tdbb, FB_FUNCTION);
transaction->getUserManagement()->commit(); // safe to be called multiple times
break;
}
}

return false;
Expand Down
Loading