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

Postfix for CORE-5067. It prevents deadlocks involving the header page

Browse Source 
and some data pages (due to disabled AST delivery).
This commit is contained in:
Dmitry Yemanov 2016-04-02 13:15:47 +03:00
parent 1472ab87b8
commit dc31f92cea
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jrd/jrd.cpp
View File

@ -6534,6 +6534,12 @@ bool JRD_shutdown_database(Database* dbb, const unsigned flags)
fb_assert(!dbb->locked()); fb_assert(!dbb->locked());
#ifdef SUPERSERVER_V2
TRA_header_write(tdbb, dbb, 0); // Update transaction info on header page.
#endif
if (flags & SHUT_DBB_RELEASE_POOLS)
TRA_update_counters(tdbb, dbb);
// Disable AST delivery as we're about to release all locks // Disable AST delivery as we're about to release all locks
{ // scope { // scope
@ -6543,12 +6549,6 @@ bool JRD_shutdown_database(Database* dbb, const unsigned flags)
// Shutdown file and/or remote connection // Shutdown file and/or remote connection
#ifdef SUPERSERVER_V2
TRA_header_write(tdbb, dbb, 0); // Update transaction info on header page.
#endif
if (flags & SHUT_DBB_RELEASE_POOLS)
TRA_update_counters(tdbb, dbb);
VIO_fini(tdbb); VIO_fini(tdbb);
if (dbb->dbb_crypto_manager) if (dbb->dbb_crypto_manager)