firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed CORE-4395: execute statement on external doesn't find Firebird 2.5 database

Browse Source
This commit is contained in:
alexpeshkoff 2014-04-28 12:51:34 +00:00
parent bb2c97fb0c
commit 3d943864f9
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/yvalve/PluginManager.cpp
View File

@ -42,6 +42,9 @@
#include "../common/classes/GenericMap.h"
#include "../common/db_alias.h"
// register builtin plugins
#include "../remote/client/interface.h"
//#define DEBUG_PLUGINS
using namespace Firebird;
@ -887,6 +890,20 @@ namespace
return NULL;
}
class BuiltinRegister
{
public:
static void init()
{
PluginManagerInterfacePtr pi;
Remote::registerRedirector(pi);
}
static void cleanup()
{
}
};
} // anonymous namespace
@ -965,6 +982,9 @@ IPluginSet* FB_CARG PluginManager::getPlugins(IStatus* status, unsigned int inte
{
try
{
static InitMutex<BuiltinRegister> registerBuiltinPlugins("RegisterBuiltinPlugins");
registerBuiltinPlugins.init();
MutexLockGuard g(plugins->mutex, FB_FUNCTION);
IPluginSet* rc = new PluginSet(interfaceType, namesList, desiredVersion, ui, firebirdConf);

18
src/yvalve/why.cpp
View File

@ -66,7 +66,6 @@
#include "../yvalve/why_proto.h"
#include "../yvalve/MasterImplementation.h"
#include "../yvalve/PluginManager.h"
#include "../remote/client/interface.h"
#include "../jrd/acl.h"
#include "../jrd/align.h"
#include "../jrd/blr.h"
@ -1159,20 +1158,6 @@ namespace Why
ShutChain* ShutChain::list = NULL;
GlobalPtr<Mutex> ShutChain::shutdownCallbackMutex;
class BuiltinRegister
{
public:
static void init()
{
PluginManagerInterfacePtr pi;
Remote::registerRedirector(pi);
}
static void cleanup()
{
}
};
class NoEntrypoint
{
public:
@ -1344,9 +1329,6 @@ namespace Why
aStatus->init();
signalInit();
static InitMutex<BuiltinRegister> registerBuiltinPlugins("RegisterBuiltinPlugins");
registerBuiltinPlugins.init();
if (!shutdownMode)
{
++dispCounter;