From 4191332d2ff74a5c9857fce20093912714c6f2b4 Mon Sep 17 00:00:00 2001 From: asfernandes Date: Tue, 10 Oct 2006 03:53:08 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20problem=20reported=20by=20Carsten=20Sch?= =?UTF-8?q?=C3=A4fer=20in=20fbdevel=20of=20incorrect=20server=20start=20wh?= =?UTF-8?q?en=20using=20connection=20pooling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jrd/jrd.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp index feb4c971da..1e9821be47 100644 --- a/src/jrd/jrd.cpp +++ b/src/jrd/jrd.cpp @@ -5561,16 +5561,21 @@ static Database* init(thread_db* tdbb, // If this is the first time through, initialize local mutexes and set // up a cleanup handler. Regardless, then lock the database mutex. - if (!initialized) { + if (!initialized) + { THREAD_EXIT(); THD_GLOBAL_MUTEX_LOCK; THREAD_ENTER(); - IntlManager::initialize(); - PluginManager::load_engine_plugins(); - if (!initialized) { + + if (!initialized) + { JRD_SS_INIT_MUTEX; gds__register_cleanup(cleanup, 0); initialized = true; + + IntlManager::initialize(); + PluginManager::load_engine_plugins(); + JRD_cache_default = Config::getDefaultDbCachePages(); if (JRD_cache_default < MIN_PAGE_BUFFERS) JRD_cache_default = MIN_PAGE_BUFFERS;