Menu
▾
▴
firebird-checkins
|
From: <ale...@us...> - 2014-09-29 11:03:56
|
Revision: 60059
http://sourceforge.net/p/firebird/code/60059
Author: alexpeshkoff
Date: 2014-09-29 11:03:47 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
Language independent API
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/CryptApplication.cpp
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/examples/interfaces/01.create.cpp
firebird/trunk/examples/interfaces/02.update.cpp
firebird/trunk/examples/interfaces/03.select.cpp
firebird/trunk/examples/interfaces/04.print_table.cpp
firebird/trunk/src/auth/AuthDbg.cpp
firebird/trunk/src/auth/AuthDbg.h
firebird/trunk/src/auth/SecureRemotePassword/Message.h
firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.h
firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.h
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.h
firebird/trunk/src/auth/trusted/AuthSspi.cpp
firebird/trunk/src/auth/trusted/AuthSspi.h
firebird/trunk/src/common/Auth.h
firebird/trunk/src/common/MsgMetadata.cpp
firebird/trunk/src/common/MsgMetadata.h
firebird/trunk/src/common/StatementMetadata.cpp
firebird/trunk/src/common/StatementMetadata.h
firebird/trunk/src/common/StatusArg.cpp
firebird/trunk/src/common/StatusArg.h
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/call_service.h
firebird/trunk/src/common/classes/ClumpletReader.cpp
firebird/trunk/src/common/classes/GetPlugins.h
firebird/trunk/src/common/classes/ImplementHelper.cpp
firebird/trunk/src/common/classes/ImplementHelper.h
firebird/trunk/src/common/classes/InternalMessageBuffer.cpp
firebird/trunk/src/common/classes/InternalMessageBuffer.h
firebird/trunk/src/common/classes/MsgPrint.cpp
firebird/trunk/src/common/classes/TempFile.h
firebird/trunk/src/common/classes/locks.h
firebird/trunk/src/common/classes/semaphore.h
firebird/trunk/src/common/classes/timestamp.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config.h
firebird/trunk/src/common/config/config_file.cpp
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/common/fb_exception.cpp
firebird/trunk/src/common/isc_sync.cpp
firebird/trunk/src/common/os/win32/mod_loader.cpp
firebird/trunk/src/common/security.cpp
firebird/trunk/src/common/security.h
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/common/utils_proto.h
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/dsql_proto.h
firebird/trunk/src/gpre/boot/gpre_meta_boot.cpp
firebird/trunk/src/gpre/languages/ftn.cpp
firebird/trunk/src/gpre/obj_cxx.cpp
firebird/trunk/src/include/fb_exception.h
firebird/trunk/src/include/firebird/Interface.h
firebird/trunk/src/include/firebird/Message.h
firebird/trunk/src/include/firebird/UdrCppEngine.h
firebird/trunk/src/include/firebird/UdrEngine.h
firebird/trunk/src/include/firebird.h
firebird/trunk/src/intl/utils/dtest.c
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/isql/isql_proto.h
firebird/trunk/src/isql/show.epp
firebird/trunk/src/isql/show_proto.h
firebird/trunk/src/jrd/Attachment.h
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/CryptoManager.h
firebird/trunk/src/jrd/Database.h
firebird/trunk/src/jrd/DbCreators.cpp
firebird/trunk/src/jrd/EngineInterface.h
firebird/trunk/src/jrd/ExtEngineManager.cpp
firebird/trunk/src/jrd/ExtEngineManager.h
firebird/trunk/src/jrd/IntlManager.cpp
firebird/trunk/src/jrd/Mapping.cpp
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/UserManagement.cpp
firebird/trunk/src/jrd/UserManagement.h
firebird/trunk/src/jrd/blb.h
firebird/trunk/src/jrd/constants.h
firebird/trunk/src/jrd/event.h
firebird/trunk/src/jrd/exe.cpp
firebird/trunk/src/jrd/fun.epp
firebird/trunk/src/jrd/ibase.h
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/jrd.h
firebird/trunk/src/jrd/ntrace.h
firebird/trunk/src/jrd/recsrc/ProcedureScan.cpp
firebird/trunk/src/jrd/req.h
firebird/trunk/src/jrd/scl.h
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/jrd/svc.h
firebird/trunk/src/jrd/tra.cpp
firebird/trunk/src/jrd/tra.h
firebird/trunk/src/jrd/trace/TraceConfigStorage.cpp
firebird/trunk/src/jrd/trace/TraceConfigStorage.h
firebird/trunk/src/jrd/trace/TraceDSQLHelpers.h
firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
firebird/trunk/src/jrd/trace/TraceLog.cpp
firebird/trunk/src/jrd/trace/TraceManager.cpp
firebird/trunk/src/jrd/trace/TraceManager.h
firebird/trunk/src/jrd/trace/TraceObjects.cpp
firebird/trunk/src/jrd/trace/TraceObjects.h
firebird/trunk/src/plugins/crypt/arc4/Arc4.cpp
firebird/trunk/src/plugins/crypt/arc4/Arc4.h
firebird/trunk/src/plugins/udr_engine/UdrEngine.cpp
firebird/trunk/src/qli/help.epp
firebird/trunk/src/remote/client/BlrFromMessage.cpp
firebird/trunk/src/remote/client/BlrFromMessage.h
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
firebird/trunk/src/utilities/guard/util.cpp
firebird/trunk/src/utilities/ibmgr/srvrmgr.cpp
firebird/trunk/src/utilities/ntrace/PluginLogWriter.h
firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp
firebird/trunk/src/utilities/ntrace/TracePluginImpl.h
firebird/trunk/src/utilities/ntrace/traceplugin.cpp
firebird/trunk/src/yvalve/DistributedTransaction.cpp
firebird/trunk/src/yvalve/MasterImplementation.cpp
firebird/trunk/src/yvalve/MasterImplementation.h
firebird/trunk/src/yvalve/PluginManager.cpp
firebird/trunk/src/yvalve/PluginManager.h
firebird/trunk/src/yvalve/YObjects.h
firebird/trunk/src/yvalve/gds.cpp
firebird/trunk/src/yvalve/gds_proto.h
firebird/trunk/src/yvalve/perf.cpp
firebird/trunk/src/yvalve/prepa_proto.h
firebird/trunk/src/yvalve/preparse.cpp
firebird/trunk/src/yvalve/utl.cpp
firebird/trunk/src/yvalve/utl_proto.h
firebird/trunk/src/yvalve/why.cpp
firebird/trunk/src/yvalve/why_proto.h
Added Paths:
-----------
firebird/trunk/src/include/firebird/FirebirdInterface.idl
firebird/trunk/src/include/firebird/IdlFbInterfaces.h
Removed Paths:
-------------
firebird/trunk/src/include/firebird/Auth.h
firebird/trunk/src/include/firebird/Crypt.h
firebird/trunk/src/include/firebird/ExternalEngine.h
firebird/trunk/src/include/firebird/Plugin.h
firebird/trunk/src/include/firebird/Provider.h
firebird/trunk/src/include/firebird/Timer.h
firebird/trunk/src/include/firebird/Utl.h
Modified: firebird/trunk/examples/dbcrypt/CryptApplication.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/dbcrypt/CryptApplication.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -29,15 +29,14 @@
#include <stdlib.h>
#include <ibase.h>
-#include <firebird/Crypt.h>
-#include <firebird/Provider.h>
+#include <firebird/Interface.h>
using namespace Firebird;
-class CryptKey : public ICryptKeyCallback
+class CryptKey : public Api::CryptKeyCallbackImpl<CryptKey>
{
public:
- unsigned int FB_CARG callback(unsigned int, const void*, unsigned int length, void* buffer)
+ unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer)
{
if (length > 0 && buffer)
{
@@ -48,13 +47,8 @@
return 1;
}
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_CRYPT_CALLBACK_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return NULL; // OK for application, not for plugin
}
};
@@ -72,7 +66,7 @@
if (tra)
{
tra->rollback(status);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
print("rollback");
tra->release();
@@ -81,7 +75,7 @@
if (att)
{
att->detach(status);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
print("detach");
att->release();
@@ -103,19 +97,19 @@
p = master->getDispatcher();
p->setDbCryptCallback(status, &key);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "setDbCryptCallback";
char s[256];
sprintf(s, "localhost:%s", dbName);
att = p->attachDatabase(status, s, 0, NULL);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "attachDatabase";
if (a != NONE)
{
tra = att->startTransaction(status, 0, NULL);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "startTransaction";
}
@@ -123,20 +117,20 @@
{
att->execute(status, tra, 0,
"ALTER DATABASE ENCRYPT WITH \"DbCrypt_example\"", 3, NULL, NULL, NULL, NULL);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "execute";
}
if (a == DEC)
{
att->execute(status, tra, 0, "ALTER DATABASE DECRYPT", 3, NULL, NULL, NULL, NULL);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "execute";
}
if (tra)
{
tra->commit(status);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "commit";
tra = NULL;
}
@@ -145,7 +139,7 @@
getchar();
att->detach(status);
- if (!status->isSuccess())
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
throw "detach";
att = NULL;
@@ -156,7 +150,7 @@
void print(const char* where)
{
fprintf(stderr, "Error in %s: ", where);
- isc_print_status(status->get());
+ isc_print_status(status->getErrors());
}
private:
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -27,11 +27,12 @@
#include <stdio.h>
#include <string.h>
-#include "firebird.h"
-#include "firebird/Crypt.h"
+#include "firebird/Interface.h"
+#include "firebird.h" // Needed for atomic support
#include "../common/classes/fb_atomic.h"
+
using namespace Firebird;
namespace
@@ -40,7 +41,7 @@
IMaster* master = NULL;
IPluginManager* pluginManager = NULL;
-class PluginModule : public IPluginModule
+class PluginModule : public Api::PluginModuleImpl<PluginModule>
{
public:
PluginModule()
@@ -62,17 +63,12 @@
}
}
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_PLUGIN_MODULE_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return this;
}
- void FB_CARG doClean()
+ void doClean()
{
flag = false;
}
@@ -83,10 +79,10 @@
PluginModule module;
-class CryptKeyHolder : public IKeyHolderPlugin
+class CryptKeyHolder : public Api::KeyHolderPluginImpl<CryptKeyHolder>
{
public:
- explicit CryptKeyHolder(IPluginConfig* cnf)
+ explicit CryptKeyHolder(IPluginConfig* cnf) throw()
: callbackInterface(this), config(cnf), key(0), owner(NULL)
{
config->addRef();
@@ -98,10 +94,10 @@
}
// IKeyHolderPlugin implementation
- virtual int FB_CARG keyCallback(IStatus* status, ICryptKeyCallback* callback);
- virtual ICryptKeyCallback* FB_CARG keyHandle(IStatus* status, const char* keyName);
+ int keyCallback(IStatus* status, ICryptKeyCallback* callback);
+ ICryptKeyCallback* keyHandle(IStatus* status, const char* keyName);
- int FB_CARG release()
+ int release()
{
if (--refCounter == 0)
{
@@ -111,27 +107,22 @@
return 1;
}
- void FB_CARG addRef()
+ void addRef()
{
++refCounter;
}
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_KEYHOLDER_PLUGIN_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return &module;
}
- void FB_CARG setOwner(Firebird::IRefCounted* o)
+ void setOwner(Firebird::IReferenceCounted* o)
{
owner = o;
}
- IRefCounted* FB_CARG getOwner()
+ IReferenceCounted* getOwner()
{
return owner;
}
@@ -142,14 +133,14 @@
}
private:
- class CallbackInterface : public ICryptKeyCallback
+ class CallbackInterface : public Api::CryptKeyCallbackImpl<CallbackInterface>
{
public:
explicit CallbackInterface(CryptKeyHolder* p)
: parent(p)
{ }
- unsigned int FB_CARG callback(unsigned int, const void*, unsigned int length, void* buffer)
+ unsigned int callback(unsigned int, const void*, unsigned int length, void* buffer)
{
UCHAR k = parent->getKey();
if (!k)
@@ -164,13 +155,8 @@
return 1;
}
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_CRYPT_CALLBACK_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return &module;
}
@@ -184,7 +170,7 @@
UCHAR key;
AtomicCounter refCounter;
- IRefCounted* owner;
+ IReferenceCounted* owner;
void noKeyError(IStatus* status);
};
@@ -200,7 +186,7 @@
status->setErrors(vector);
}
-int FB_CARG CryptKeyHolder::keyCallback(IStatus* status, ICryptKeyCallback* callback)
+int CryptKeyHolder::keyCallback(IStatus* status, ICryptKeyCallback* callback)
{
status->init();
@@ -236,7 +222,7 @@
return 1;
}
-ICryptKeyCallback* FB_CARG CryptKeyHolder::keyHandle(IStatus* status, const char* keyName)
+ICryptKeyCallback* CryptKeyHolder::keyHandle(IStatus* status, const char* keyName)
{
if (strcmp(keyName, "sample") != 0)
{
@@ -246,20 +232,15 @@
return &callbackInterface;
}
-class Factory : public IPluginFactory
+class Factory : public Api::PluginFactoryImpl<Factory>
{
public:
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_PLUGIN_FACTORY_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return &module;
}
- IPluginBase* FB_CARG createPlugin(IStatus* status, IPluginConfig* factoryParameter)
+ IPluginBase* createPlugin(IStatus* status, IPluginConfig* factoryParameter)
{
try
{
@@ -267,9 +248,10 @@
p->addRef();
return p;
}
- catch (const Exception& ex)
+ catch (...)
{
- ex.stuffException(status);
+ ISC_STATUS st[3] = {isc_arg_gds, isc_virmemexh, isc_arg_end};
+ status->setErrors(st);
}
return NULL;
}
@@ -285,6 +267,6 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(PluginType::KeyHolder, "CryptKeyHolder_example",
+ pluginManager->registerPluginFactory(IPluginManager::KeyHolder, "CryptKeyHolder_example",
&factory);
}
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -24,9 +24,9 @@
* Contributor(s): ______________________________________.
*/
-#include "firebird.h"
-#include "firebird/Crypt.h"
+#include "firebird/Interface.h"
+#include "firebird.h" // Needed for atomic support
#include "../common/classes/fb_atomic.h"
using namespace Firebird;
@@ -37,7 +37,7 @@
IMaster* master = NULL;
IPluginManager* pluginManager = NULL;
-class PluginModule : public IPluginModule
+class PluginModule : public Api::PluginModuleImpl<PluginModule>
{
public:
PluginModule()
@@ -59,17 +59,12 @@
}
}
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_PLUGIN_MODULE_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return this;
}
- void FB_CARG doClean()
+ void doClean()
{
flag = false;
}
@@ -80,10 +75,10 @@
PluginModule module;
-class DbCrypt : public IDbCryptPlugin
+class DbCrypt : public Api::DbCryptPluginImpl<DbCrypt>
{
public:
- explicit DbCrypt(IPluginConfig* cnf)
+ explicit DbCrypt(IPluginConfig* cnf) throw()
: config(cnf), key(0), owner(NULL)
{
config->addRef();
@@ -95,11 +90,11 @@
}
// ICryptPlugin implementation
- void FB_CARG encrypt(IStatus* status, unsigned int length, const void* from, void* to);
- void FB_CARG decrypt(IStatus* status, unsigned int length, const void* from, void* to);
- void FB_CARG setKey(IStatus* status, unsigned int length, IKeyHolderPlugin** sources);
+ void encrypt(IStatus* status, unsigned int length, const void* from, void* to);
+ void decrypt(IStatus* status, unsigned int length, const void* from, void* to);
+ void setKey(IStatus* status, unsigned int length, IKeyHolderPlugin** sources);
- int FB_CARG release()
+ int release()
{
if (--refCounter == 0)
{
@@ -109,27 +104,22 @@
return 1;
}
- void FB_CARG addRef()
+ void addRef()
{
++refCounter;
}
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_DBCRYPT_PLUGIN_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return &module;
}
- void FB_CARG setOwner(IRefCounted* o)
+ void setOwner(IReferenceCounted* o)
{
owner = o;
}
- IRefCounted* FB_CARG getOwner()
+ IReferenceCounted* getOwner()
{
return owner;
}
@@ -139,7 +129,7 @@
UCHAR key;
AtomicCounter refCounter;
- IRefCounted* owner;
+ IReferenceCounted* owner;
void noKeyError(IStatus* status);
};
@@ -155,7 +145,7 @@
status->setErrors(vector);
}
-void FB_CARG DbCrypt::encrypt(IStatus* status, unsigned int length, const void* from, void* to)
+void DbCrypt::encrypt(IStatus* status, unsigned int length, const void* from, void* to)
{
status->init();
@@ -174,7 +164,7 @@
}
}
-void FB_CARG DbCrypt::decrypt(IStatus* status, unsigned int length, const void* from, void* to)
+void DbCrypt::decrypt(IStatus* status, unsigned int length, const void* from, void* to)
{
status->init();
@@ -193,7 +183,7 @@
}
}
-void FB_CARG DbCrypt::setKey(IStatus* status, unsigned int length, IKeyHolderPlugin** sources)
+void DbCrypt::setKey(IStatus* status, unsigned int length, IKeyHolderPlugin** sources)
{
status->init();
@@ -249,20 +239,15 @@
noKeyError(status);
}
-class Factory : public IPluginFactory
+class Factory : public Api::PluginFactoryImpl<Factory>
{
public:
- int FB_CARG getVersion()
+ IPluginModule* getModule()
{
- return FB_PLUGIN_FACTORY_VERSION;
- }
-
- IPluginModule* FB_CARG getModule()
- {
return &module;
}
- IPluginBase* FB_CARG createPlugin(IStatus* status, IPluginConfig* factoryParameter)
+ IPluginBase* createPlugin(IStatus* status, IPluginConfig* factoryParameter)
{
try
{
@@ -270,9 +255,10 @@
p->addRef();
return p;
}
- catch (const Exception& ex)
+ catch (...)
{
- ex.stuffException(status);
+ ISC_STATUS st[3] = {isc_arg_gds, isc_virmemexh, isc_arg_end};
+ status->setErrors(st);
}
return NULL;
}
@@ -288,5 +274,5 @@
pluginManager = master->getPluginManager();
module.registerMe();
- pluginManager->registerPluginFactory(PluginType::DbCrypt, "DbCrypt_example", &factory);
+ pluginManager->registerPluginFactory(IPluginManager::DbCrypt, "DbCrypt_example", &factory);
}
Modified: firebird/trunk/examples/interfaces/01.create.cpp
===================================================================
--- firebird/trunk/examples/interfaces/01.create.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/interfaces/01.create.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -38,7 +38,7 @@
#include <string.h>
#include <ibase.h>
-#include <firebird/Provider.h>
+#include <firebird/Interface.h>
using namespace Firebird;
Modified: firebird/trunk/examples/interfaces/02.update.cpp
===================================================================
--- firebird/trunk/examples/interfaces/02.update.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/interfaces/02.update.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -40,7 +40,7 @@
#include <string.h>
#include <ibase.h>
-#include <firebird/Provider.h>
+#include <firebird/Interface.h>
using namespace Firebird;
Modified: firebird/trunk/examples/interfaces/03.select.cpp
===================================================================
--- firebird/trunk/examples/interfaces/03.select.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/interfaces/03.select.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -38,7 +38,7 @@
#include <string.h>
#include <ibase.h>
-#include <firebird/Provider.h>
+#include <firebird/Interface.h>
using namespace Firebird;
Modified: firebird/trunk/examples/interfaces/04.print_table.cpp
===================================================================
--- firebird/trunk/examples/interfaces/04.print_table.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/examples/interfaces/04.print_table.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -37,7 +37,7 @@
#include <string.h>
#include <ibase.h>
-#include <firebird/Provider.h>
+#include <firebird/Interface.h>
using namespace Firebird;
@@ -254,7 +254,7 @@
try
{
// use attachment's method to access BLOB object
- blob = att->openBlob(st, tra, (ISC_QUAD*) (buf + offset));
+ blob = att->openBlob(st, tra, (ISC_QUAD*) (buf + offset), 0, NULL);
check(st, "openBlob");
char segbuf[16];
Modified: firebird/trunk/src/auth/AuthDbg.cpp
===================================================================
--- firebird/trunk/src/auth/AuthDbg.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/AuthDbg.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -34,8 +34,6 @@
//#define AUTH_VERBOSE
-static Firebird::MakeUpgradeInfo<> upInfo;
-
// register plugin
static Firebird::SimpleFactory<Auth::DebugClient> clientFactory;
static Firebird::SimpleFactory<Auth::DebugServer> serverFactory;
@@ -48,8 +46,8 @@
Firebird::PluginManagerInterfacePtr iPlugin;
- iPlugin->registerPluginFactory(Firebird::PluginType::AuthClient, name, &clientFactory);
- iPlugin->registerPluginFactory(Firebird::PluginType::AuthServer, name, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, name, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, name, &serverFactory);
}
@@ -63,8 +61,8 @@
check(&s);
}
-int FB_CARG DebugServer::authenticate(Firebird::IStatus* status, IServerBlock* sb,
- IWriter* writerInterface)
+int DebugServer::authenticate(Firebird::IStatus* status, Firebird::IServerBlock* sb,
+ Firebird::IWriter* writerInterface)
{
try
{
@@ -123,7 +121,7 @@
return AUTH_FAILED;
}
-int FB_CARG DebugServer::release()
+int DebugServer::release()
{
if (--refCounter == 0)
{
@@ -138,7 +136,7 @@
: str(getPool())
{ }
-int FB_CARG DebugClient::authenticate(Firebird::IStatus* status, IClientBlock* cb)
+int DebugClient::authenticate(Firebird::IStatus* status, Firebird::IClientBlock* cb)
{
try
{
@@ -185,7 +183,7 @@
return AUTH_FAILED;
}
-int FB_CARG DebugClient::release()
+int DebugClient::release()
{
if (--refCounter == 0)
{
Modified: firebird/trunk/src/auth/AuthDbg.h
===================================================================
--- firebird/trunk/src/auth/AuthDbg.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/AuthDbg.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -34,8 +34,7 @@
#ifdef AUTH_DEBUG
-#include "firebird/Auth.h"
-#include "firebird/Plugin.h"
+#include "firebird/Interface.h"
#include "../common/classes/ImplementHelper.h"
#include "../common/classes/ClumpletWriter.h"
#include "../common/classes/init.h"
@@ -47,13 +46,13 @@
// The idea of debug plugin is to send some data from server to client,
// modify them on client and return result (which becomes login name) to the server
-class DebugServer FB_FINAL : public Firebird::StdPlugin<IServer, FB_AUTH_SERVER_VERSION>
+class DebugServer FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ServerImpl<DebugServer> >
{
public:
explicit DebugServer(Firebird::IPluginConfig*);
- int authenticate(Firebird::IStatus* status, IServerBlock* sBlock,
- IWriter* writerInterface);
+ int authenticate(Firebird::IStatus* status, Firebird::IServerBlock* sBlock,
+ Firebird::IWriter* writerInterface);
int release();
private:
@@ -61,12 +60,12 @@
Firebird::RefPtr<Firebird::IConfig> config;
};
-class DebugClient FB_FINAL : public Firebird::StdPlugin<IClient, FB_AUTH_CLIENT_VERSION>
+class DebugClient FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ClientImpl<DebugClient> >
{
public:
DebugClient(Firebird::IPluginConfig*);
- int authenticate(Firebird::IStatus* status, IClientBlock* sBlock);
+ int authenticate(Firebird::IStatus* status, Firebird::IClientBlock* sBlock);
int release();
private:
Modified: firebird/trunk/src/auth/SecureRemotePassword/Message.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/Message.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecureRemotePassword/Message.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -2,13 +2,14 @@
#define INTERNAL_FIREBIRD
#endif
-#include "firebird/Provider.h"
+#include "firebird/Interface.h"
#ifdef INTERNAL_FIREBIRD
#include "../common/classes/alloc.h"
#include "../common/StatusHolder.h"
#include "../common/classes/ImplementHelper.h"
+#include "../dsql/sqlda_pub.h"
#else // INTERNAL_FIREBIRD
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -34,7 +34,7 @@
namespace Auth {
-class SrpClient FB_FINAL : public StdPlugin<IClient, FB_AUTH_CLIENT_VERSION>
+class SrpClient FB_FINAL : public StdPlugin<Api::ClientImpl<SrpClient> >
{
public:
explicit SrpClient(IPluginConfig*)
@@ -43,8 +43,8 @@
{ }
// IClient implementation
- int FB_CARG authenticate(IStatus*, IClientBlock* cb);
- int FB_CARG release();
+ int authenticate(IStatus*, IClientBlock* cb);
+ int release();
private:
RemotePassword* client;
@@ -75,7 +75,9 @@
client->genClientKey(data);
dumpIt("Clnt: clientPubKey", data);
cb->putData(status, data.length(), data.begin());
- return status->getStatus() & IStatus::FB_HAS_ERRORS ? AUTH_FAILED : AUTH_MORE_DATA;
+ if (status->getStatus() & IStatus::FB_HAS_ERRORS)
+ return AUTH_FAILED;
+ return AUTH_MORE_DATA;
}
HANDSHAKE_DEBUG(fprintf(stderr, "Cli: SRP phase2\n"));
@@ -164,7 +166,7 @@
void registerSrpClient(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(PluginType::AuthClient, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::AuthClient, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -27,7 +27,7 @@
#ifndef AUTH_SRP_CLIENT_H
#define AUTH_SRP_CLIENT_H
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
namespace Auth {
Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -29,16 +29,16 @@
#include "../common/classes/ImplementHelper.h"
#include "../common/classes/ClumpletWriter.h"
#include "../common/StatusHolder.h"
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
#include "../auth/SecureRemotePassword/srp.h"
#include "../jrd/constants.h"
+#include "../jrd/inf_pub.h"
#include "../utilities/gsec/gsec.h"
#include "../auth/SecureRemotePassword/Message.h"
#include "../common/classes/auto.h"
namespace {
-Firebird::MakeUpgradeInfo<> upInfo;
const unsigned int INIT_KEY = ((~0) - 1);
unsigned int secDbKey = INIT_KEY;
@@ -52,7 +52,7 @@
namespace Auth {
-class SrpManagement FB_FINAL : public Firebird::StdPlugin<IManagement, FB_AUTH_MANAGE_VERSION>
+class SrpManagement FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ManagementImpl<SrpManagement> >
{
public:
explicit SrpManagement(Firebird::IPluginConfig* par)
@@ -126,7 +126,7 @@
}
}
- void grantRevokeAdmin(Auth::IUser* user, bool ignoreRevoke = false)
+ void grantRevokeAdmin(Firebird::IUser* user, bool ignoreRevoke = false)
{
if (!user->admin()->entered())
{
@@ -185,12 +185,10 @@
public:
// IManagement implementation
- void FB_CARG start(Firebird::IStatus* status, ILogonInfo* logonInfo)
+ void start(Firebird::IStatus* status, Firebird::ILogonInfo* logonInfo)
{
try
{
- Firebird::MasterInterfacePtr()->upgradeInterface(logonInfo, FB_AUTH_LOGON_INFO_VERSION, upInfo);
-
status->init();
if (att)
@@ -257,16 +255,10 @@
}
}
- int FB_CARG execute(Firebird::IStatus* status, IUser* user, IListUsers* callback)
+ int execute(Firebird::IStatus* status, Firebird::IUser* user, Firebird::IListUsers* callback)
{
try
{
- if (callback)
- {
- Firebird::MasterInterfacePtr()->upgradeInterface(callback, FB_AUTH_LIST_USERS_VERSION, upInfo);
- }
- Firebird::MasterInterfacePtr()->upgradeInterface(user, FB_AUTH_USER_VERSION, upInfo);
-
status->init();
fb_assert(att);
@@ -608,7 +600,7 @@
return 0;
}
- void FB_CARG commit(Firebird::IStatus* status)
+ void commit(Firebird::IStatus* status)
{
if (tra)
{
@@ -620,7 +612,7 @@
}
}
- void FB_CARG rollback(Firebird::IStatus* status)
+ void rollback(Firebird::IStatus* status)
{
if (tra)
{
@@ -632,7 +624,7 @@
}
}
- int FB_CARG release()
+ int release()
{
if (--refCounter == 0)
{
@@ -697,7 +689,7 @@
}
}
- static void setField(Varfield& to, Auth::ICharUserField* from)
+ static void setField(Varfield& to, Firebird::ICharUserField* from)
{
if (from->entered())
{
@@ -709,7 +701,7 @@
}
}
- static void setField(Boolean& to, Auth::IIntUserField* from)
+ static void setField(Boolean& to, Firebird::IIntUserField* from)
{
if (from->entered())
{
@@ -721,7 +713,7 @@
}
}
- void setField(Firebird::IStatus* st, Blob& to, Auth::ICharUserField* from)
+ void setField(Firebird::IStatus* st, Blob& to, Firebird::ICharUserField* from)
{
if (from->entered())
{
@@ -733,7 +725,7 @@
}
}
- static void allocField(Auth::IUserField* value, Firebird::string& update, const char* name)
+ static void allocField(Firebird::IUserField* value, Firebird::string& update, const char* name)
{
if (value->entered() || value->specified())
{
@@ -744,7 +736,7 @@
}
template <typename FT>
- static void allocField(Firebird::AutoPtr<FT>& field, Message& up, Auth::IUserField* value)
+ static void allocField(Firebird::AutoPtr<FT>& field, Message& up, Firebird::IUserField* value)
{
if (value->entered() || value->specified())
{
@@ -752,7 +744,7 @@
}
}
- static void assignField(Firebird::AutoPtr<Varfield>& field, Auth::ICharUserField* name)
+ static void assignField(Firebird::AutoPtr<Varfield>& field, Firebird::ICharUserField* name)
{
if (field.hasData())
{
@@ -768,7 +760,7 @@
}
}
- static void assignField(Firebird::AutoPtr<Boolean>& field, Auth::IIntUserField* name)
+ static void assignField(Firebird::AutoPtr<Boolean>& field, Firebird::IIntUserField* name)
{
if (field.hasData())
{
@@ -784,7 +776,7 @@
}
}
- void assignField(Firebird::IStatus* st, Firebird::AutoPtr<Blob>& field, Auth::ICharUserField* name)
+ void assignField(Firebird::IStatus* st, Firebird::AutoPtr<Blob>& field, Firebird::ICharUserField* name)
{
if (field.hasData())
{
@@ -801,7 +793,7 @@
}
}
- static void listField(Auth::ICharUserField* to, Varfield& from)
+ static void listField(Firebird::ICharUserField* to, Varfield& from)
{
Firebird::LocalStatus st;
to->setEntered(&st, from.null ? 0 : 1);
@@ -813,7 +805,7 @@
}
}
- static void listField(Auth::IIntUserField* to, Boolean& from)
+ static void listField(Firebird::IIntUserField* to, Boolean& from)
{
Firebird::LocalStatus st;
to->setEntered(&st, from.null ? 0 : 1);
@@ -825,7 +817,7 @@
}
}
- void listField(Auth::ICharUserField* to, Blob& from)
+ void listField(Firebird::ICharUserField* to, Blob& from)
{
Firebird::LocalStatus st;
to->setEntered(&st, from.null ? 0 : 1);
@@ -836,7 +828,7 @@
Firebird::IBlob* blob = NULL;
try
{
- blob = att->openBlob(&st, tra, &from);
+ blob = att->openBlob(&st, tra, &from, 0, NULL);
check(&st);
char segbuf[256];
@@ -865,7 +857,7 @@
}
}
- void blobWrite(Firebird::IStatus* st, Blob& to, Auth::ICharUserField* from)
+ void blobWrite(Firebird::IStatus* st, Blob& to, Firebird::ICharUserField* from)
{
to.null = FB_FALSE;
const char* ptr = from->get();
@@ -874,7 +866,7 @@
Firebird::IBlob* blob = NULL;
try
{
- blob = att->createBlob(st, tra, &to);
+ blob = att->createBlob(st, tra, &to, 0, NULL);
check(st);
blob->putSegment(st, l, ptr);
@@ -900,6 +892,6 @@
extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::PluginType::AuthUserManagement, Auth::RemotePassword::plugName, &Auth::factory);
- Firebird::myModule->registerMe();
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, Auth::RemotePassword::plugName, &Auth::factory);
+ Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -32,7 +32,7 @@
#include "../common/classes/ClumpletWriter.h"
#include "../auth/SecureRemotePassword/Message.h"
-#include "../jrd/EngineInterface.h"
+#include "../jrd/constants.h"
using namespace Firebird;
@@ -43,14 +43,12 @@
const unsigned int SZ_LOGIN = 31;
-MakeUpgradeInfo<> upInfo;
-
}
namespace Auth {
-class SrpServer FB_FINAL : public StdPlugin<IServer, FB_AUTH_SERVER_VERSION>
+class SrpServer FB_FINAL : public StdPlugin<Api::ServerImpl<SrpServer> >
{
public:
explicit SrpServer(IPluginConfig* par)
@@ -65,8 +63,8 @@
}
// IServer implementation
- int FB_CARG authenticate(IStatus* status, IServerBlock* sBlock, IWriter* writerInterface);
- int FB_CARG release();
+ int authenticate(IStatus* status, IServerBlock* sBlock, IWriter* writerInterface);
+ int release();
private:
RemotePassword* server;
@@ -248,7 +246,6 @@
BigInteger serverProof = server->clientProof(account.c_str(), salt.c_str(), sessionKey);
if (clientProof == serverProof)
{
- MasterInterfacePtr()->upgradeInterface(writerInterface, FB_AUTH_WRITER_VERSION, upInfo);
writerInterface->add(status, account.c_str());
if (status->getStatus() & IStatus::FB_HAS_ERRORS)
{
@@ -288,7 +285,7 @@
void registerSrpServer(IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(PluginType::AuthServer, RemotePassword::plugName, &factory);
+ iPlugin->registerPluginFactory(IPluginManager::AuthServer, RemotePassword::plugName, &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -27,7 +27,7 @@
#ifndef AUTH_SRP_SERVER_H
#define AUTH_SRP_SERVER_H
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
namespace Auth {
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -35,7 +35,7 @@
namespace Auth {
-int SecurityDatabaseClient::authenticate(Firebird::IStatus* status, IClientBlock* cb)
+int SecurityDatabaseClient::authenticate(Firebird::IStatus* status, Firebird::IClientBlock* cb)
{
// fprintf(stderr, "Clnt: Legacy: lgn=%s pswd=%s\n", cb->getLogin(), cb->getPassword());
if (!(cb->getLogin() && cb->getPassword()))
@@ -43,8 +43,8 @@
return AUTH_CONTINUE;
}
- TEXT pwt[Auth::MAX_LEGACY_PASSWORD_LENGTH + 2];
- ENC_crypt(pwt, sizeof pwt, cb->getPassword(), Auth::LEGACY_PASSWORD_SALT);
+ TEXT pwt[MAX_LEGACY_PASSWORD_LENGTH + 2];
+ ENC_crypt(pwt, sizeof pwt, cb->getPassword(), LEGACY_PASSWORD_SALT);
cb->putData(status, static_cast<unsigned>(strlen(&pwt[2])), &pwt[2]);
if (status->getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
@@ -70,7 +70,7 @@
void registerLegacyClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::PluginType::AuthClient, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, "Legacy_Auth", &factory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyClient.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -27,7 +27,7 @@
#ifndef AUTH_LEGACY_CLIENT_H
#define AUTH_LEGACY_CLIENT_H
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
#include "../common/classes/ImplementHelper.h"
namespace Auth {
@@ -35,7 +35,7 @@
// Required to stop analyzing rest of plugins before first roundtrip to server
// if legacy login is present in DPB
-class SecurityDatabaseClient FB_FINAL : public Firebird::StdPlugin<IClient, FB_AUTH_CLIENT_VERSION>
+class SecurityDatabaseClient FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ClientImpl<SecurityDatabaseClient> >
{
public:
explicit SecurityDatabaseClient(Firebird::IPluginConfig*)
@@ -43,8 +43,8 @@
}
// IClient implementation
- int FB_CARG authenticate(Firebird::IStatus*, IClientBlock* data);
- int FB_CARG release();
+ int authenticate(Firebird::IStatus*, Firebird::IClientBlock* data);
+ int release();
};
void registerLegacyClient(Firebird::IPluginManager* iPlugin);
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -41,17 +41,15 @@
#include "../common/classes/ImplementHelper.h"
#include "../common/classes/ClumpletWriter.h"
#include "../common/StatusHolder.h"
-#include "firebird/Plugin.h"
+#include "firebird/Interface.h"
-static Firebird::MakeUpgradeInfo<> upInfo;
-
// Here we use version-independent symbolic link (or copy) of actual database
DATABASE database = STATIC FILENAME "security.fdb";
static Firebird::GlobalPtr<Firebird::Mutex> execLineMutex; // protects various gpre generated structures
static bool grantRevokeAdmin(ISC_STATUS* isc_status, FB_API_HANDLE database, FB_API_HANDLE trans,
- Auth::IUser* user)
+ Firebird::IUser* user)
{
if (!user->admin()->entered())
{
@@ -113,12 +111,10 @@
check(&s);
}
-void FB_CARG SecurityDatabaseManagement::start(Firebird::IStatus* st, ILogonInfo* logonInfo)
+void SecurityDatabaseManagement::start(Firebird::IStatus* st, Firebird::ILogonInfo* logonInfo)
{
try
{
- Firebird::MasterInterfacePtr()->upgradeInterface(logonInfo, FB_AUTH_LOGON_INFO_VERSION, upInfo);
-
st->init();
if (secDbKey == INIT_KEY)
@@ -169,7 +165,7 @@
}
}
-void FB_CARG SecurityDatabaseManagement::commit(Firebird::IStatus* st)
+void SecurityDatabaseManagement::commit(Firebird::IStatus* st)
{
try
{
@@ -190,7 +186,7 @@
}
}
-void FB_CARG SecurityDatabaseManagement::rollback(Firebird::IStatus* st)
+void SecurityDatabaseManagement::rollback(Firebird::IStatus* st)
{
try
{
@@ -211,7 +207,7 @@
}
}
-int FB_CARG SecurityDatabaseManagement::release()
+int SecurityDatabaseManagement::release()
{
if (--refCounter == 0)
{
@@ -236,7 +232,7 @@
strncpy(to, from, len);
}
-int FB_CARG SecurityDatabaseManagement::execute(Firebird::IStatus* st, IUser* user, IListUsers* callback)
+int SecurityDatabaseManagement::execute(Firebird::IStatus* st, Firebird::IUser* user, Firebird::IListUsers* callback)
{
/*************************************
*
@@ -302,8 +298,6 @@
try
{
- Firebird::MasterInterfacePtr()->upgradeInterface(user, FB_AUTH_USER_VERSION, upInfo);
-
ISC_STATUS_ARRAY isc_status;
fb_utils::init_status(isc_status);
st->init();
@@ -765,6 +759,6 @@
extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
{
Firebird::CachedMasterInterface::set(master);
- Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::PluginType::AuthUserManagement, "Legacy_UserManager", &factory);
- Firebird::myModule->registerMe();
+ Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::AuthUserManagement, "Legacy_UserManager", &factory);
+ Firebird::getUnloadDetector()->registerMe();
}
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -28,23 +28,23 @@
#define AUTH_LEGACY_MANAGEMENT_H
#include "../common/classes/ImplementHelper.h"
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
namespace Auth {
-class SecurityDatabaseManagement FB_FINAL : public Firebird::StdPlugin<IManagement, FB_AUTH_MANAGE_VERSION>
+class SecurityDatabaseManagement FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ManagementImpl<SecurityDatabaseManagement> >
{
public:
explicit SecurityDatabaseManagement(Firebird::IPluginConfig* par);
// IManagement implementation
- void FB_CARG start(Firebird::IStatus* status, ILogonInfo* logonInfo);
- int FB_CARG execute(Firebird::IStatus* status, IUser* user, IListUsers* callback);
- void FB_CARG commit(Firebird::IStatus* status);
- void FB_CARG rollback(Firebird::IStatus* status);
+ void start(Firebird::IStatus* status, Firebird::ILogonInfo* logonInfo);
+ int execute(Firebird::IStatus* status, Firebird::IUser* user, Firebird::IListUsers* callback);
+ void commit(Firebird::IStatus* status);
+ void rollback(Firebird::IStatus* status);
- int FB_CARG release();
+ int release();
private:
Firebird::RefPtr<Firebird::IFirebirdConf> config;
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -41,7 +41,7 @@
#include "../common/classes/objects_array.h"
#include "../common/classes/init.h"
#include "../common/classes/ImplementHelper.h"
-#include "firebird/Timer.h"
+#include "firebird/Interface.h"
#include "../remote/remot_proto.h"
@@ -51,8 +51,6 @@
namespace {
-MakeUpgradeInfo<> upInfo;
-
// BLR to search database for user name record
const UCHAR PWD_REQUEST[] =
@@ -126,7 +124,7 @@
namespace Auth {
-class SecurityDatabase FB_FINAL : public Firebird::RefCntIface<Firebird::ITimer, FB_TIMER_VERSION>
+class SecurityDatabase FB_FINAL : public Firebird::RefCntIface<Firebird::Api::TimerImpl<SecurityDatabase> >
{
public:
int verify(IWriter* authBlock, IServerBlock* sBlock);
@@ -151,9 +149,9 @@
}
// ITimer implementation
- void FB_CARG handler();
+ void handler();
- int FB_CARG release()
+ int release()
{
if (--refCounter == 0)
{
@@ -325,7 +323,7 @@
char pw1[MAX_LEGACY_PASSWORD_LENGTH + 1];
if (!lookup_user(login.c_str(), pw1))
{
- return AUTH_FAILED;
+ return IAuth::AUTH_FAILED;
}
pw1[MAX_LEGACY_PASSWORD_LENGTH] = 0;
string storedHash(pw1, MAX_LEGACY_PASSWORD_LENGTH);
@@ -346,20 +344,19 @@
}
if (!legacyHash)
{
- return AUTH_FAILED;
+ return IAuth::AUTH_FAILED;
}
}
LocalStatus s;
- MasterInterfacePtr()->upgradeInterface(authBlock, FB_AUTH_WRITER_VERSION, upInfo);
authBlock->add(&s, login.c_str());
check(&s);
authBlock->setDb(&s, secureDbName);
check(&s);
- return AUTH_SUCCESS;
+ return IAuth::AUTH_SUCCESS;
}
- return AUTH_CONTINUE;
+ return IAuth::AUTH_CONTINUE;
}
void SecurityDatabase::checkStatus(const char* callName, ISC_STATUS userError)
@@ -392,7 +389,7 @@
GlobalPtr<InstancesArray> instances;
GlobalPtr<Mutex> instancesMutex;
-void FB_CARG SecurityDatabase::handler()
+void SecurityDatabase::handler()
{
try
{
@@ -525,7 +522,7 @@
HANDSHAKE_DEBUG(fprintf(stderr, "LegacyServer: exception status %d\n", status->getStatus()));
HANDSHAKE_DEBUG(isc_print_status(status->getErrors()));
HANDSHAKE_DEBUG(isc_print_status(status->getWarnings()));
- return AUTH_FAILED;
+ return IAuth::AUTH_FAILED;
}
}
@@ -546,7 +543,7 @@
void registerLegacyServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::PluginType::AuthServer, "Legacy_Auth", &factory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, "Legacy_Auth", &factory);
}
} // namespace Auth
@@ -558,9 +555,9 @@
{
CachedMasterInterface::set(master);
- myModule->setCleanup(Auth::SecurityDatabase::cleanup);
+ getUnloadDetector()->setCleanup(Auth::SecurityDatabase::cleanup);
Auth::registerLegacyServer(PluginManagerInterfacePtr());
- myModule->registerMe();
+ getUnloadDetector()->registerMe();
}
#endif // PLUG_MODULE
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.h
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -34,7 +34,7 @@
#include "../common/classes/ClumpletWriter.h"
#include "../common/classes/ImplementHelper.h"
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -43,7 +43,7 @@
namespace Auth {
-class SecurityDatabaseServer FB_FINAL : public Firebird::StdPlugin<IServer, FB_AUTH_SERVER_VERSION>
+class SecurityDatabaseServer FB_FINAL : public Firebird::StdPlugin<Firebird::Api::ServerImpl<SecurityDatabaseServer> >
{
public:
explicit SecurityDatabaseServer(Firebird::IPluginConfig* p)
@@ -51,8 +51,8 @@
{ }
// IServer implementation
- int FB_CARG authenticate(Firebird::IStatus* status, IServerBlock* sBlock, IWriter* writerInterface);
- int FB_CARG release();
+ int authenticate(Firebird::IStatus* status, Firebird::IServerBlock* sBlock, Firebird::IWriter* writerInterface);
+ int release();
private:
Firebird::RefPtr<Firebird::IPluginConfig> iParameter;
Modified: firebird/trunk/src/auth/trusted/AuthSspi.cpp
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/trusted/AuthSspi.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -71,8 +71,6 @@
*dataSize = strlen(name);
}
*/
-
- MakeUpgradeInfo<> upInfo;
}
namespace Auth {
@@ -365,7 +363,6 @@
bool wheel = false;
string login;
sspi.getLogin(login, wheel);
- MasterInterfacePtr()->upgradeInterface(writerInterface, FB_AUTH_WRITER_VERSION, upInfo);
writerInterface->add(status, login.c_str());
if (wheel)
@@ -443,12 +440,12 @@
void registerTrustedClient(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::PluginType::AuthClient, plugName, &clientFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthClient, plugName, &clientFactory);
}
void registerTrustedServer(Firebird::IPluginManager* iPlugin)
{
- iPlugin->registerPluginFactory(Firebird::PluginType::AuthServer, plugName, &serverFactory);
+ iPlugin->registerPluginFactory(Firebird::IPluginManager::AuthServer, plugName, &serverFactory);
}
} // namespace Auth
Modified: firebird/trunk/src/auth/trusted/AuthSspi.h
===================================================================
--- firebird/trunk/src/auth/trusted/AuthSspi.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/auth/trusted/AuthSspi.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -40,7 +40,7 @@
#include <../common/classes/array.h>
#include "../common/classes/ImplementHelper.h"
#include <../jrd/ibase.h>
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
#define SECURITY_WIN32
@@ -100,12 +100,12 @@
bool getLogin(Firebird::string& login, bool& wh);
};
-class WinSspiServer : public Firebird::StdPlugin<IServer, FB_AUTH_SERVER_VERSION>
+class WinSspiServer : public Firebird::StdPlugin<Firebird::Api::ServerImpl<WinSspiServer> >
{
public:
// IServer implementation
- int FB_CARG authenticate(Firebird::IStatus* status, IServerBlock* sBlock, IWriter* writerInterface);
- int FB_CARG release();
+ int authenticate(Firebird::IStatus* status, Firebird::IServerBlock* sBlock, Firebird::IWriter* writerInterface);
+ int release();
WinSspiServer(Firebird::IPluginConfig*);
@@ -114,12 +114,12 @@
AuthSspi sspi;
};
-class WinSspiClient : public Firebird::StdPlugin<IClient, FB_AUTH_CLIENT_VERSION>
+class WinSspiClient : public Firebird::StdPlugin<Firebird::Api::ClientImpl<WinSspiClient> >
{
public:
// IClient implementation
- int FB_CARG authenticate(Firebird::IStatus* status, IClientBlock* sBlock);
- int FB_CARG release();
+ int authenticate(Firebird::IStatus* status, Firebird::IClientBlock* sBlock);
+ int release();
WinSspiClient(Firebird::IPluginConfig*);
Modified: firebird/trunk/src/common/Auth.h
===================================================================
--- firebird/trunk/src/common/Auth.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/common/Auth.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -30,7 +30,7 @@
#ifndef FB_AUTH_H
#define FB_AUTH_H
-#include "firebird/Auth.h"
+#include "firebird/Interface.h"
#include "../common/classes/ClumpletWriter.h"
#include "../common/classes/init.h"
#include "../common/classes/array.h"
@@ -39,7 +39,7 @@
namespace Auth {
-class WriterImplementation : public Firebird::AutoIface<IWriter, FB_AUTH_WRITER_VERSION>
+class WriterImplementation : public Firebird::AutoIface<Firebird::Api::WriterImpl<WriterImplementation> >
{
public:
WriterImplementation();
@@ -48,10 +48,10 @@
void setPlugin(const char* m);
// IWriter implementation
- void FB_CARG reset();
- void FB_CARG add(Firebird::IStatus* st, const char* name);
- void FB_CARG setType(Firebird::IStatus* st, const char* value);
- void FB_CARG setDb(Firebird::IStatus* st, const char* value);
+ void reset();
+ void add(Firebird::IStatus* st, const char* name);
+ void setType(Firebird::IStatus* st, const char* value);
+ void setDb(Firebird::IStatus* st, const char* value);
private:
Firebird::ClumpletWriter current, result;
Modified: firebird/trunk/src/common/MsgMetadata.cpp
===================================================================
--- firebird/trunk/src/common/MsgMetadata.cpp 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/common/MsgMetadata.cpp 2014-09-29 11:03:47 UTC (rev 60059)
@@ -44,7 +44,7 @@
msgMetadata->items.grow(fieldCount);
}
-int FB_CARG MetadataBuilder::release()
+int MetadataBuilder::release()
{
if (--refCounter != 0)
{
@@ -55,7 +55,7 @@
return 0;
}
-void FB_CARG MetadataBuilder::setType(IStatus* status, unsigned index, unsigned type)
+void MetadataBuilder::setType(IStatus* status, unsigned index, unsigned type)
{
try
{
@@ -81,7 +81,7 @@
}
}
-void FB_CARG MetadataBuilder::setSubType(IStatus* status, unsigned index, int subType)
+void MetadataBuilder::setSubType(IStatus* status, unsigned index, int subType)
{
try
{
@@ -96,7 +96,7 @@
}
}
-void FB_CARG MetadataBuilder::setLength(IStatus* status, unsigned index, unsigned length)
+void MetadataBuilder::setLength(IStatus* status, unsigned index, unsigned length)
{
try
{
@@ -114,7 +114,7 @@
}
}
-void FB_CARG MetadataBuilder::setCharSet(IStatus* status, unsigned index, unsigned charSet)
+void MetadataBuilder::setCharSet(IStatus* status, unsigned index, unsigned charSet)
{
try
{
@@ -129,7 +129,7 @@
}
}
-void FB_CARG MetadataBuilder::setScale(IStatus* status, unsigned index, unsigned scale)
+void MetadataBuilder::setScale(IStatus* status, unsigned index, unsigned scale)
{
try
{
@@ -144,7 +144,7 @@
}
}
-void FB_CARG MetadataBuilder::truncate(IStatus* status, unsigned count)
+void MetadataBuilder::truncate(IStatus* status, unsigned count)
{
try
{
@@ -161,7 +161,7 @@
}
}
-void FB_CARG MetadataBuilder::remove(IStatus* status, unsigned index)
+void MetadataBuilder::remove(IStatus* status, unsigned index)
{
try
{
@@ -177,7 +177,7 @@
}
}
-void FB_CARG MetadataBuilder::moveNameToIndex(IStatus* status, const char* name, unsigned index)
+void MetadataBuilder::moveNameToIndex(IStatus* status, const char* name, unsigned index)
{
try
{
@@ -206,7 +206,7 @@
}
}
-unsigned FB_CARG MetadataBuilder::addField(IStatus* status)
+unsigned MetadataBuilder::addField(IStatus* status)
{
try
{
@@ -224,7 +224,7 @@
}
}
-IMessageMetadata* FB_CARG MetadataBuilder::getMetadata(IStatus* status)
+IMessageMetadata* MetadataBuilder::getMetadata(IStatus* status)
{
try
{
@@ -386,7 +386,7 @@
return 0;
}
-
+/*
int AttMetadata::release()
{
if (--refCounter != 0)
@@ -396,6 +396,6 @@
delete this;
return 0;
-}
+}*/
} // namespace Firebird
Modified: firebird/trunk/src/common/MsgMetadata.h
===================================================================
--- firebird/trunk/src/common/MsgMetadata.h 2014-09-29 10:51:40 UTC (rev 60058)
+++ firebird/trunk/src/common/MsgMetadata.h 2014-09-29 11:03:47 UTC (rev 60059)
@@ -25,7 +25,7 @@
#ifndef COMMON_MSG_METADATA_H
#define COMMON_MSG_METADATA_H
-#include "firebird/Provider.h"
+#include "firebird/Interface.h"
#include "iberror.h"
#include "../common/classes/fb_string.h"
#include "../common/classes/objects_array.h"
@@ -38,7 +38,7 @@
class StatementMetadata;
class MetadataFromBlr;
-class MsgMetadata : public RefCntIface<IMessageMetadata, FB_MESSAGE_METADATA_VERSION>
+class MsgMetadata : public RefCntIface<Api::MessageMetadataImpl<MsgMetadata> >
{
friend class MetadataBuilder;
friend class StatementMetadata;
@@ -138,14 +138,14 @@
}
// IMessageMetadata implementation
- virtual int FB_CARG release();
+ int release();
- virtual unsigned FB_CARG getCount(IStatus* /*status*/)
+ unsigned getCount(IStatus* /*status*/)
{
return (unsigned) items.getCount();
}
- virtual const char* FB_CARG getField(IStatus* status, unsigned index)
+ const char* getField(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].field.c_str();
@@ -154,7 +154,7 @@
return NULL;
}
- virtual const char* FB_CARG getRelation(IStatus* status, unsigned index)
+ const char* getRelation(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].relation.c_str();
@@ -163,7 +163,7 @@
return NULL;
}
- virtual const char* FB_CARG getOwner(IStatus* status, unsigned index)
+ const char* getOwner(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].owner.c_str();
@@ -172,7 +172,7 @@
return NULL;
}
- virtual const char* FB_CARG getAlias(IStatus* status, unsigned index)
+ const char* getAlias(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].alias.c_str();
@@ -181,7 +181,7 @@
return NULL;
}
- virtual unsigned FB_CARG getType(IStatus* status, unsigned index)
+ unsigned getType(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].type;
@@ -190,7 +190,7 @@
return 0;
}
- virtual FB_BOOLEAN FB_CARG isNullable(IStatus* status, unsigned index)
+ FB_BOOLEAN isNullable(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].nullable;
@@ -199,7 +199,7 @@
return false;
}
- virtual int FB_CARG getSubType(IStatus* status, unsigned index)
+ int getSubType(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].subType;
@@ -208,7 +208,7 @@
return 0;
}
- virtual unsigned FB_CARG getLength(IStatus* status, unsigned index)
+ unsigned getLength(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].length;
@@ -217,7 +217,7 @@
return 0;
}
- virtual int FB_CARG getScale(IStatus* status, unsigned index)
+ int getScale(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].scale;
@@ -226,7 +226,7 @@
return 0;
}
- virtual unsigned FB_CARG getCharSet(IStatus* status, unsigned index)
+ unsigned getCharSet(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].charSet;
@@ -235,7 +235,7 @@
return 0;
}
- virtual unsigned FB_CARG getOffset(IStatus* status, unsigned index)
+ unsigned getOffset(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].offset;
@@ -244,7 +244,7 @@
return 0;
}
- virtual unsigned FB_CARG getNullOffset(IStatus* status, unsigned index)
+ unsigned getNullOffset(IStatus* status, unsigned index)
{
if (index < items.getCount())
return items[index].nullInd;
@@ -253,9 +253,9 @@
return 0;
}
- virtual IMetadataBuilder* FB_CARG getBuilder(IStatus* status);
+ IMetadataBuilder* getBuilder(IStatus* status);
- virtual unsigned FB_CARG getMessageLength(IStatus* /*status*/)
+ unsigned getMessageLength(IStatus* /*status*/)
{
return length;
}
@@ -278,39 +278,39 @@
unsigned length;
};
+//class AttMetadata : public Api::MessageMetadataBaseImpl<AttMetadata, MsgMetadata>
class AttMetadata : public MsgMetadata
{
public:
explicit AttMetadata(RefCounted* att)
- : MsgMetadata(),
- attachment(att)
+ : attachment(att)
{ }
// re-implement here release() present in MsgMetadata to call correct dtor
- virtual int FB_CARG release();
+ //virtual int release();
RefPtr<RefCounted> attachment;
};
-class MetadataBuilder FB_FINAL : public RefCntIface<IMetadataBuilder, FB_METADATA_BUILDER_VERSION>
+class MetadataBuilder FB_FINAL : public RefCntIface<Api::MetadataBuilderImpl<MetadataBuilder> >
{
public:
explicit MetadataBuilder(const MsgMetadata* from);
MetadataBuilder(unsigned fieldCount);
- virtu...
[truncated message content] |
|
From: <fir...@us...> - 2014-09-30 01:25:33
|
Revision: 60061
http://sourceforge.net/p/firebird/code/60061
Author: firebirds
Date: 2014-09-30 01:25:24 +0000 (Tue, 30 Sep 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-09-29 17:24:30 UTC (rev 60060)
+++ firebird/trunk/ChangeLog 2014-09-30 01:25:24 UTC (rev 60061)
@@ -1,3 +1,185 @@
+ 2014-09-29 17:24 alexpeshkoff
+ M src/burp/burp.cpp
+ M src/burp/burp.h
+ M src/burp/split/spit.h
+ M src/dsql/StmtNodes.cpp
+ M src/isql/isql.epp
+ M src/jrd/constants.h
+ M src/jrd/exe.cpp
+ M src/jrd/exe_proto.h
+ M src/jrd/jrd.cpp
+ M src/jrd/req.h
+ M src/jrd/svc.h
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/perf.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/utl_proto.h
+Make it build on windows, work in progress - boot build is working
+
+ 2014-09-29 11:03 alexpeshkoff
+ M examples/dbcrypt/CryptApplication.cpp
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M examples/interfaces/01.create.cpp
+ M examples/interfaces/02.update.cpp
+ M examples/interfaces/03.select.cpp
+ M examples/interfaces/04.print_table.cpp
+ M src/auth/AuthDbg.cpp
+ M src/auth/AuthDbg.h
+ M src/auth/SecureRemotePassword/Message.h
+ M src/auth/SecureRemotePassword/client/SrpClient.cpp
+ M src/auth/SecureRemotePassword/client/SrpClient.h
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.h
+ M src/auth/SecurityDatabase/LegacyClient.cpp
+ M src/auth/SecurityDatabase/LegacyClient.h
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyManagement.h
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/SecurityDatabase/LegacyServer.h
+ M src/auth/trusted/AuthSspi.cpp
+ M src/auth/trusted/AuthSspi.h
+ M src/common/Auth.h
+ M src/common/MsgMetadata.cpp
+ M src/common/MsgMetadata.h
+ M src/common/StatementMetadata.cpp
+ M src/common/StatementMetadata.h
+ M src/common/StatusArg.cpp
+ M src/common/StatusArg.h
+ M src/common/StatusHolder.h
+ M src/common/call_service.cpp
+ M src/common/call_service.h
+ M src/common/classes/ClumpletReader.cpp
+ M src/common/classes/GetPlugins.h
+ M src/common/classes/ImplementHelper.cpp
+ M src/common/classes/ImplementHelper.h
+ M src/common/classes/InternalMessageBuffer.cpp
+ M src/common/classes/InternalMessageBuffer.h
+ M src/common/classes/MsgPrint.cpp
+ M src/common/classes/TempFile.h
+ M src/common/classes/locks.h
+ M src/common/classes/semaphore.h
+ M src/common/classes/timestamp.cpp
+ M src/common/config/config.cpp
+ M src/common/config/config.h
+ M src/common/config/config_file.cpp
+ M src/common/db_alias.cpp
+ M src/common/fb_exception.cpp
+ M src/common/isc_sync.cpp
+ M src/common/os/win32/mod_loader.cpp
+ M src/common/security.cpp
+ M src/common/security.h
+ M src/common/utils.cpp
+ M src/common/utils_proto.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql_proto.h
+ M src/gpre/boot/gpre_meta_boot.cpp
+ M src/gpre/languages/ftn.cpp
+ M src/gpre/obj_cxx.cpp
+ M src/include/fb_exception.h
+ D src/include/firebird/Auth.h
+ D src/include/firebird/Crypt.h
+ D src/include/firebird/ExternalEngine.h
+ A src/include/firebird/FirebirdInterface.idl
+ A src/include/firebird/IdlFbInterfaces.h
+ M src/include/firebird/Interface.h
+ M src/include/firebird/Message.h
+ D src/include/firebird/Plugin.h
+ D src/include/firebird/Provider.h
+ D src/include/firebird/Timer.h
+ M src/include/firebird/UdrCppEngine.h
+ M src/include/firebird/UdrEngine.h
+ D src/include/firebird/Utl.h
+ M src/include/firebird.h
+ M src/intl/utils/dtest.c
+ M src/isql/isql.epp
+ M src/isql/isql_proto.h
+ M src/isql/show.epp
+ M src/isql/show_proto.h
+ M src/jrd/Attachment.h
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+ M src/jrd/Database.h
+ M src/jrd/DbCreators.cpp
+ M src/jrd/EngineInterface.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/ExtEngineManager.h
+ M src/jrd/IntlManager.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/SysFunction.cpp
+ M src/jrd/UserManagement.cpp
+ M src/jrd/UserManagement.h
+ M src/jrd/blb.h
+ M src/jrd/constants.h
+ M src/jrd/event.h
+ M src/jrd/exe.cpp
+ M src/jrd/fun.epp
+ M src/jrd/ibase.h
+ M src/jrd/jrd.cpp
+ M src/jrd/jrd.h
+ M src/jrd/ntrace.h
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/req.h
+ M src/jrd/scl.h
+ M src/jrd/svc.cpp
+ M src/jrd/svc.h
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceConfigStorage.h
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceLog.cpp
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/jrd/trace/TraceObjects.cpp
+ M src/jrd/trace/TraceObjects.h
+ M src/plugins/crypt/arc4/Arc4.cpp
+ M src/plugins/crypt/arc4/Arc4.h
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/qli/help.epp
+ M src/remote/client/BlrFromMessage.cpp
+ M src/remote/client/BlrFromMessage.h
+ M src/remote/client/interface.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/utilities/guard/util.cpp
+ M src/utilities/ibmgr/srvrmgr.cpp
+ M src/utilities/ntrace/PluginLogWriter.h
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/TracePluginImpl.h
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/MasterImplementation.h
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/PluginManager.h
+ M src/yvalve/YObjects.h
+ M src/yvalve/gds.cpp
+ M src/yvalve/gds_proto.h
+ M src/yvalve/perf.cpp
+ M src/yvalve/prepa_proto.h
+ M src/yvalve/preparse.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/utl_proto.h
+ M src/yvalve/why.cpp
+ M src/yvalve/why_proto.h
+Language independent API
+
+ 2014-09-29 10:51 alexpeshkoff
+ M src/remote/client/interface.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+Fixed access to freed memory in remote redirector. This should fix CORE-4557.
+
2014-09-28 09:43 hvlad
M src/alice/alice.cpp
M src/alice/alice.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-09-29 17:24:30 UTC (rev 60060)
+++ firebird/trunk/src/jrd/build_no.h 2014-09-30 01:25:24 UTC (rev 60061)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31336
+ FORMAL BUILD NUMBER:31339
*/
-#define PRODUCT_VER_STRING "3.0.0.31336"
-#define FILE_VER_STRING "WI-T3.0.0.31336"
-#define LICENSE_VER_STRING "WI-T3.0.0.31336"
-#define FILE_VER_NUMBER 3, 0, 0, 31336
+#define PRODUCT_VER_STRING "3.0.0.31339"
+#define FILE_VER_STRING "WI-T3.0.0.31339"
+#define LICENSE_VER_STRING "WI-T3.0.0.31339"
+#define FILE_VER_NUMBER 3, 0, 0, 31339
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31336"
+#define FB_BUILD_NO "31339"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-09-29 17:24:30 UTC (rev 60060)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-09-30 01:25:24 UTC (rev 60061)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31336
+BuildNum=31339
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-01 01:24:18
|
Revision: 60070
http://sourceforge.net/p/firebird/code/60070
Author: firebirds
Date: 2014-10-01 01:24:15 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-09-30 20:01:41 UTC (rev 60069)
+++ firebird/trunk/ChangeLog 2014-10-01 01:24:15 UTC (rev 60070)
@@ -1,3 +1,71 @@
+ 2014-09-30 19:38 hvlad
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceManager.h
+ M src/jrd/trace/TraceObjects.h
+Warnings. Misc.
+
+ 2014-09-30 17:35 dimitr
+ M src/include/gen/ids.h
+ M src/jrd/Monitoring.cpp
+ M src/jrd/Monitoring.h
+ M src/jrd/names.h
+ M src/jrd/relations.h
+CORE-4564: Add per-table performance counters to the monitoring tables.
+
+ 2014-09-30 15:04 alexpeshkoff
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/include/firebird/FirebirdInterface.idl
+ M src/include/firebird/IdlFbInterfaces.h
+ M src/jrd/SysFunction.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/recsrc/ProcedureScan.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+ M src/jrd/trace/TraceManager.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+Better place for trace-related constants, thanks to Vlad
+
+ 2014-09-30 14:21 alexpeshkoff
+ M src/alice/alice.cpp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/auth/SecurityDatabase/LegacyServer.h
+ M src/iscguard/cntl_guard.cpp
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/Monitoring.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/jrd.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+ M src/jrd/ods.h
+ M src/jrd/pag.cpp
+ M src/jrd/shut.cpp
+ M src/lock/print.cpp
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/remote/server/os/win32/window.cpp
+ M src/utilities/gstat/dba.epp
+ M src/utilities/gstat/dbaswi.h
+ M src/utilities/gstat/ppg.cpp
+ M src/utilities/nbackup/nbackup.cpp
+Fixed windows build
+
+ 2014-09-30 10:28 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2014-09-30 09:12 alexpeshkoff
+ M src/dsql/DdlNodes.epp
+warning
+
2014-09-29 17:24 alexpeshkoff
M src/burp/burp.cpp
M src/burp/burp.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-09-30 20:01:41 UTC (rev 60069)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-01 01:24:15 UTC (rev 60070)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31339
+ FORMAL BUILD NUMBER:31345
*/
-#define PRODUCT_VER_STRING "3.0.0.31339"
-#define FILE_VER_STRING "WI-T3.0.0.31339"
-#define LICENSE_VER_STRING "WI-T3.0.0.31339"
-#define FILE_VER_NUMBER 3, 0, 0, 31339
+#define PRODUCT_VER_STRING "3.0.0.31345"
+#define FILE_VER_STRING "WI-T3.0.0.31345"
+#define LICENSE_VER_STRING "WI-T3.0.0.31345"
+#define FILE_VER_NUMBER 3, 0, 0, 31345
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31339"
+#define FB_BUILD_NO "31345"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-09-30 20:01:41 UTC (rev 60069)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-01 01:24:15 UTC (rev 60070)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31339
+BuildNum=31345
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-02 01:25:43
|
Revision: 60074
http://sourceforge.net/p/firebird/code/60074
Author: firebirds
Date: 2014-10-02 01:25:33 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-01 22:00:35 UTC (rev 60073)
+++ firebird/trunk/ChangeLog 2014-10-02 01:25:33 UTC (rev 60074)
@@ -1,3 +1,18 @@
+ 2014-10-01 22:00 hvlad
+ M src/jrd/validation.cpp
+ M src/jrd/validation.h
+Improvement CORE-4562 : Split all validation messages on critical and minor ones
+Additional patch, see details in tracker
+
+ 2014-10-01 18:17 hvlad
+ M src/jrd/cch.cpp
+Fixed bug CORE-4565 : GDSCODE can have value = 0 in WHEN-section under some concurrent env., only in SC or CS (not in SS)
+
+ 2014-10-01 12:47 alexpeshkoff
+ M src/plugins/udr_engine/UdrEngine.cpp
+ M src/yvalve/why.cpp
+Fixed 2 segfaults when using UDRs
+
2014-09-30 19:38 hvlad
M src/jrd/recsrc/ProcedureScan.cpp
M src/jrd/trace/TraceDSQLHelpers.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-01 22:00:35 UTC (rev 60073)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-02 01:25:33 UTC (rev 60074)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31345
+ FORMAL BUILD NUMBER:31348
*/
-#define PRODUCT_VER_STRING "3.0.0.31345"
-#define FILE_VER_STRING "WI-T3.0.0.31345"
-#define LICENSE_VER_STRING "WI-T3.0.0.31345"
-#define FILE_VER_NUMBER 3, 0, 0, 31345
+#define PRODUCT_VER_STRING "3.0.0.31348"
+#define FILE_VER_STRING "WI-T3.0.0.31348"
+#define LICENSE_VER_STRING "WI-T3.0.0.31348"
+#define FILE_VER_NUMBER 3, 0, 0, 31348
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31345"
+#define FB_BUILD_NO "31348"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-01 22:00:35 UTC (rev 60073)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-02 01:25:33 UTC (rev 60074)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31345
+BuildNum=31348
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-03 01:28:00
|
Revision: 60076
http://sourceforge.net/p/firebird/code/60076
Author: firebirds
Date: 2014-10-03 01:27:57 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-02 14:46:22 UTC (rev 60075)
+++ firebird/trunk/ChangeLog 2014-10-03 01:27:57 UTC (rev 60076)
@@ -1,3 +1,8 @@
+ 2014-10-02 14:46 alexpeshkoff
+ M src/yvalve/DistributedTransaction.cpp
+ M src/yvalve/why.cpp
+Fixed segfaults in DTC - thanks to Adriano
+
2014-10-01 22:00 hvlad
M src/jrd/validation.cpp
M src/jrd/validation.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-02 14:46:22 UTC (rev 60075)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-03 01:27:57 UTC (rev 60076)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31348
+ FORMAL BUILD NUMBER:31349
*/
-#define PRODUCT_VER_STRING "3.0.0.31348"
-#define FILE_VER_STRING "WI-T3.0.0.31348"
-#define LICENSE_VER_STRING "WI-T3.0.0.31348"
-#define FILE_VER_NUMBER 3, 0, 0, 31348
+#define PRODUCT_VER_STRING "3.0.0.31349"
+#define FILE_VER_STRING "WI-T3.0.0.31349"
+#define LICENSE_VER_STRING "WI-T3.0.0.31349"
+#define FILE_VER_NUMBER 3, 0, 0, 31349
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31348"
+#define FB_BUILD_NO "31349"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-02 14:46:22 UTC (rev 60075)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-03 01:27:57 UTC (rev 60076)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31348
+BuildNum=31349
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-04 01:27:00
|
Revision: 60079
http://sourceforge.net/p/firebird/code/60079
Author: firebirds
Date: 2014-10-04 01:26:52 +0000 (Sat, 04 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-03 16:20:31 UTC (rev 60078)
+++ firebird/trunk/ChangeLog 2014-10-04 01:26:52 UTC (rev 60079)
@@ -1,3 +1,12 @@
+ 2014-10-03 16:20 asfernandes
+ M src/isql/isql.epp
+Fix padding of UNICODE_FSS - complement to CORE-3431 (UTF-8) fix.
+Hope this does not cause a lot of ISQL-based tests to fail.
+
+ 2014-10-03 16:15 dimitr
+ M src/remote/protocol.cpp
+Restore zero-initialization of message items flagged as NULLs.
+
2014-10-02 14:46 alexpeshkoff
M src/yvalve/DistributedTransaction.cpp
M src/yvalve/why.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-03 16:20:31 UTC (rev 60078)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-04 01:26:52 UTC (rev 60079)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31349
+ FORMAL BUILD NUMBER:31351
*/
-#define PRODUCT_VER_STRING "3.0.0.31349"
-#define FILE_VER_STRING "WI-T3.0.0.31349"
-#define LICENSE_VER_STRING "WI-T3.0.0.31349"
-#define FILE_VER_NUMBER 3, 0, 0, 31349
+#define PRODUCT_VER_STRING "3.0.0.31351"
+#define FILE_VER_STRING "WI-T3.0.0.31351"
+#define LICENSE_VER_STRING "WI-T3.0.0.31351"
+#define FILE_VER_NUMBER 3, 0, 0, 31351
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31349"
+#define FB_BUILD_NO "31351"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-03 16:20:31 UTC (rev 60078)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-04 01:26:52 UTC (rev 60079)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31349
+BuildNum=31351
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-05 01:30:03
|
Revision: 60081
http://sourceforge.net/p/firebird/code/60081
Author: firebirds
Date: 2014-10-05 01:29:58 +0000 (Sun, 05 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-04 20:10:14 UTC (rev 60080)
+++ firebird/trunk/ChangeLog 2014-10-05 01:29:58 UTC (rev 60081)
@@ -1,3 +1,10 @@
+ 2014-10-04 20:10 dimitr
+ M src/jrd/cch.cpp
+ M src/jrd/cch_proto.h
+ M src/jrd/err.cpp
+ M src/jrd/jrd.cpp
+Refactored cache shutdown. This should also fix CORE-4568: Server may crash while disconnecting from the database under load.
+
2014-10-03 16:20 asfernandes
M src/isql/isql.epp
Fix padding of UNICODE_FSS - complement to CORE-3431 (UTF-8) fix.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-04 20:10:14 UTC (rev 60080)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-05 01:29:58 UTC (rev 60081)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31351
+ FORMAL BUILD NUMBER:31352
*/
-#define PRODUCT_VER_STRING "3.0.0.31351"
-#define FILE_VER_STRING "WI-T3.0.0.31351"
-#define LICENSE_VER_STRING "WI-T3.0.0.31351"
-#define FILE_VER_NUMBER 3, 0, 0, 31351
+#define PRODUCT_VER_STRING "3.0.0.31352"
+#define FILE_VER_STRING "WI-T3.0.0.31352"
+#define LICENSE_VER_STRING "WI-T3.0.0.31352"
+#define FILE_VER_NUMBER 3, 0, 0, 31352
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31351"
+#define FB_BUILD_NO "31352"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-04 20:10:14 UTC (rev 60080)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-05 01:29:58 UTC (rev 60081)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31351
+BuildNum=31352
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-06 01:22:51
|
Revision: 60085
http://sourceforge.net/p/firebird/code/60085
Author: firebirds
Date: 2014-10-06 01:22:42 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-05 13:16:22 UTC (rev 60084)
+++ firebird/trunk/ChangeLog 2014-10-06 01:22:42 UTC (rev 60085)
@@ -1,3 +1,11 @@
+ 2014-10-05 13:14 alexpeshkoff
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/dsql.h
+ M src/dsql/make.cpp
+ M src/dsql/metd.epp
+ M src/jrd/irq.h
+Fixed CORE-4566: Incorrect size of the output parameter/argument when execute block, procedure or function use system field in metadata charset
+
2014-10-04 20:10 dimitr
M src/jrd/cch.cpp
M src/jrd/cch_proto.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-05 13:16:22 UTC (rev 60084)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-06 01:22:42 UTC (rev 60085)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31352
+ FORMAL BUILD NUMBER:31353
*/
-#define PRODUCT_VER_STRING "3.0.0.31352"
-#define FILE_VER_STRING "WI-T3.0.0.31352"
-#define LICENSE_VER_STRING "WI-T3.0.0.31352"
-#define FILE_VER_NUMBER 3, 0, 0, 31352
+#define PRODUCT_VER_STRING "3.0.0.31353"
+#define FILE_VER_STRING "WI-T3.0.0.31353"
+#define LICENSE_VER_STRING "WI-T3.0.0.31353"
+#define FILE_VER_NUMBER 3, 0, 0, 31353
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31352"
+#define FB_BUILD_NO "31353"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-05 13:16:22 UTC (rev 60084)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-06 01:22:42 UTC (rev 60085)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31352
+BuildNum=31353
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-09 01:27:08
|
Revision: 60090
http://sourceforge.net/p/firebird/code/60090
Author: firebirds
Date: 2014-10-09 01:27:04 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-08 12:19:23 UTC (rev 60089)
+++ firebird/trunk/ChangeLog 2014-10-09 01:27:04 UTC (rev 60090)
@@ -1,3 +1,11 @@
+ 2014-10-08 12:19 alexpeshkoff
+ M src/common/call_service.cpp
+Fixed CORE-4573: Avoid need in fake -pas switch when using gsec in embedded mode
+
+ 2014-10-07 14:46 asfernandes
+ M src/dsql/PackageNodes.epp
+Fixed CORE-4570 - Wrong error at ALTER PACKAGE.
+
2014-10-05 13:14 alexpeshkoff
M src/dsql/ExprNodes.cpp
M src/dsql/dsql.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-08 12:19:23 UTC (rev 60089)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-09 01:27:04 UTC (rev 60090)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31353
+ FORMAL BUILD NUMBER:31355
*/
-#define PRODUCT_VER_STRING "3.0.0.31353"
-#define FILE_VER_STRING "WI-T3.0.0.31353"
-#define LICENSE_VER_STRING "WI-T3.0.0.31353"
-#define FILE_VER_NUMBER 3, 0, 0, 31353
+#define PRODUCT_VER_STRING "3.0.0.31355"
+#define FILE_VER_STRING "WI-T3.0.0.31355"
+#define LICENSE_VER_STRING "WI-T3.0.0.31355"
+#define FILE_VER_NUMBER 3, 0, 0, 31355
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31353"
+#define FB_BUILD_NO "31355"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-08 12:19:23 UTC (rev 60089)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-09 01:27:04 UTC (rev 60090)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31353
+BuildNum=31355
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-10 01:23:49
|
Revision: 60093
http://sourceforge.net/p/firebird/code/60093
Author: firebirds
Date: 2014-10-10 01:23:40 +0000 (Fri, 10 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-09 15:25:39 UTC (rev 60092)
+++ firebird/trunk/ChangeLog 2014-10-10 01:23:40 UTC (rev 60093)
@@ -1,3 +1,14 @@
+ 2014-10-09 15:25 alexpeshkoff
+ M src/jrd/Mapping.cpp
+ M src/jrd/Mapping.h
+ M src/jrd/jrd.cpp
+ M src/jrd/svc.cpp
+Fixed use of encrypted database for users mapping
+
+ 2014-10-09 14:32 alexpeshkoff
+ M src/dsql/parse.y
+Fixed a warning - thanks to D.Sibiryakov
+
2014-10-08 12:19 alexpeshkoff
M src/common/call_service.cpp
Fixed CORE-4573: Avoid need in fake -pas switch when using gsec in embedded mode
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-09 15:25:39 UTC (rev 60092)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-10 01:23:40 UTC (rev 60093)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31355
+ FORMAL BUILD NUMBER:31357
*/
-#define PRODUCT_VER_STRING "3.0.0.31355"
-#define FILE_VER_STRING "WI-T3.0.0.31355"
-#define LICENSE_VER_STRING "WI-T3.0.0.31355"
-#define FILE_VER_NUMBER 3, 0, 0, 31355
+#define PRODUCT_VER_STRING "3.0.0.31357"
+#define FILE_VER_STRING "WI-T3.0.0.31357"
+#define LICENSE_VER_STRING "WI-T3.0.0.31357"
+#define FILE_VER_NUMBER 3, 0, 0, 31357
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31355"
+#define FB_BUILD_NO "31357"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-09 15:25:39 UTC (rev 60092)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-10 01:23:40 UTC (rev 60093)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31355
+BuildNum=31357
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-11 01:20:11
|
Revision: 60099
http://sourceforge.net/p/firebird/code/60099
Author: firebirds
Date: 2014-10-11 01:20:07 +0000 (Sat, 11 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-10 16:00:54 UTC (rev 60098)
+++ firebird/trunk/ChangeLog 2014-10-11 01:20:07 UTC (rev 60099)
@@ -1,3 +1,26 @@
+ 2014-10-10 16:00 asfernandes
+ M src/jrd/RecordSourceNodes.cpp
+Fixed CORE-4574 - Incorrect result in subquery with aggregate.
+
+ 2014-10-10 12:05 alexpeshkoff
+ M src/yvalve/why.cpp
+Fixed AV caused by one of my recent commits - thanks to Vlad
+
+ 2014-10-10 10:12 hvlad
+ M src/jrd/Attachment.h
+ M src/jrd/cch.cpp
+ M src/jrd/jrd.cpp
+Fixed bug CORE-4576 : Cache Writer thread could not start
+
+ 2014-10-10 10:11 hvlad
+ M src/jrd/Database.h
+ M src/jrd/vio.cpp
+Fixed bug CORE-4575 : AV in garbage collector thread at disconnect of last attachment
+
+ 2014-10-10 08:43 alexpeshkoff
+ M src/dsql/parse.y
+Removed unused rule, in case it's needed later adding it once again is trivial
+
2014-10-09 15:25 alexpeshkoff
M src/jrd/Mapping.cpp
M src/jrd/Mapping.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-10 16:00:54 UTC (rev 60098)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-11 01:20:07 UTC (rev 60099)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31357
+ FORMAL BUILD NUMBER:31362
*/
-#define PRODUCT_VER_STRING "3.0.0.31357"
-#define FILE_VER_STRING "WI-T3.0.0.31357"
-#define LICENSE_VER_STRING "WI-T3.0.0.31357"
-#define FILE_VER_NUMBER 3, 0, 0, 31357
+#define PRODUCT_VER_STRING "3.0.0.31362"
+#define FILE_VER_STRING "WI-T3.0.0.31362"
+#define LICENSE_VER_STRING "WI-T3.0.0.31362"
+#define FILE_VER_NUMBER 3, 0, 0, 31362
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31357"
+#define FB_BUILD_NO "31362"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-10 16:00:54 UTC (rev 60098)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-11 01:20:07 UTC (rev 60099)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31357
+BuildNum=31362
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-12 01:19:08
|
Revision: 60102
http://sourceforge.net/p/firebird/code/60102
Author: firebirds
Date: 2014-10-12 01:19:03 +0000 (Sun, 12 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-11 19:17:39 UTC (rev 60101)
+++ firebird/trunk/ChangeLog 2014-10-12 01:19:03 UTC (rev 60102)
@@ -1,3 +1,17 @@
+ 2014-10-11 19:17 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2014-10-11 09:02 dimitr
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/os/win32/xnet.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+Improved the batching (prefetch) logic. This is the second part of CORE-2530.
+
2014-10-10 16:00 asfernandes
M src/jrd/RecordSourceNodes.cpp
Fixed CORE-4574 - Incorrect result in subquery with aggregate.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-11 19:17:39 UTC (rev 60101)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-12 01:19:03 UTC (rev 60102)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31362
+ FORMAL BUILD NUMBER:31364
*/
-#define PRODUCT_VER_STRING "3.0.0.31362"
-#define FILE_VER_STRING "WI-T3.0.0.31362"
-#define LICENSE_VER_STRING "WI-T3.0.0.31362"
-#define FILE_VER_NUMBER 3, 0, 0, 31362
+#define PRODUCT_VER_STRING "3.0.0.31364"
+#define FILE_VER_STRING "WI-T3.0.0.31364"
+#define LICENSE_VER_STRING "WI-T3.0.0.31364"
+#define FILE_VER_NUMBER 3, 0, 0, 31364
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31362"
+#define FB_BUILD_NO "31364"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-11 19:17:39 UTC (rev 60101)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-12 01:19:03 UTC (rev 60102)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31362
+BuildNum=31364
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2014-10-12 02:25:14
|
Revision: 60104
http://sourceforge.net/p/firebird/code/60104
Author: asfernandes
Date: 2014-10-12 02:25:02 +0000 (Sun, 12 Oct 2014)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/examples/interfaces/04.print_table.cpp
firebird/trunk/src/alice/alice.h
firebird/trunk/src/alice/exe.cpp
firebird/trunk/src/common/StatusHolder.h
firebird/trunk/src/common/isc_sync.cpp
firebird/trunk/src/common/unicode_util.cpp
firebird/trunk/src/common/utils.cpp
firebird/trunk/src/dsql/DdlNodes.epp
firebird/trunk/src/dsql/DdlNodes.h
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/StmtNodes.cpp
firebird/trunk/src/dsql/dsql.cpp
firebird/trunk/src/dsql/metd.epp
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/inf.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/ods.cpp
firebird/trunk/src/jrd/pag.cpp
firebird/trunk/src/jrd/pag_proto.h
firebird/trunk/src/jrd/validation.cpp
Modified: firebird/trunk/examples/interfaces/04.print_table.cpp
===================================================================
--- firebird/trunk/examples/interfaces/04.print_table.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/examples/interfaces/04.print_table.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -260,7 +260,7 @@
char segbuf[16];
unsigned len;
// read data segment by segment
- for(;;)
+ for (;;)
{
int cc = blob->getSegment(st, sizeof(segbuf), segbuf, &len);
if (cc != IStatus::FB_OK && cc != IStatus::FB_SEGMENT)
Modified: firebird/trunk/src/alice/alice.h
===================================================================
--- firebird/trunk/src/alice/alice.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/alice/alice.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -35,7 +35,7 @@
enum val_errors {
VAL_INVALID_DB_VERSION = 0,
-
+
VAL_RECORD_ERRORS = 1,
VAL_BLOB_PAGE_ERRORS = 2,
VAL_DATA_PAGE_ERRORS = 3,
Modified: firebird/trunk/src/alice/exe.cpp
===================================================================
--- firebird/trunk/src/alice/exe.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/alice/exe.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -56,7 +56,7 @@
{
isc_info_page_errors, isc_info_record_errors, isc_info_bpage_errors,
isc_info_dpage_errors, isc_info_ipage_errors, isc_info_ppage_errors,
- isc_info_tpage_errors,
+ isc_info_tpage_errors,
fb_info_page_warns, fb_info_record_warns, fb_info_bpage_warns,
fb_info_dpage_warns, fb_info_ipage_warns, fb_info_ppage_warns,
fb_info_tpage_warns, fb_info_pip_errors, fb_info_pip_warns,
Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/StatusHolder.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -162,7 +162,6 @@
ISC_STATUS save(const IStatus* status);
void clear();
-
ISC_STATUS getError() const
{
return value()[1];
Modified: firebird/trunk/src/common/isc_sync.cpp
===================================================================
--- firebird/trunk/src/common/isc_sync.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/isc_sync.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -961,7 +961,7 @@
void handler()
{
- for(;;)
+ for (;;)
{
union semun arg;
arg.val = 0;
Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/unicode_util.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -1144,7 +1144,7 @@
if (lastError.getStatus() & Firebird::IStatus::FB_HAS_ERRORS)
{
(Arg::Gds(isc_random) << "Could not find acceptable ICU library"
- << Arg::StatusVector(lastError.getErrors())).raise();
+ << Arg::StatusVector(lastError.getErrors())).raise();
}
else
(Arg::Gds(isc_random) << "Could not find acceptable ICU library").raise();
Modified: firebird/trunk/src/common/utils.cpp
===================================================================
--- firebird/trunk/src/common/utils.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/common/utils.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -1016,7 +1016,9 @@
if (! bootBuild())
{
- if (prefType != Firebird::IConfigManager::FB_DIR_CONF && prefType != Firebird::IConfigManager::FB_DIR_MSG && configDir[prefType][0])
+ if (prefType != Firebird::IConfigManager::FB_DIR_CONF &&
+ prefType != Firebird::IConfigManager::FB_DIR_MSG &&
+ configDir[prefType][0])
{
// Value is set explicitly and is not environment overridable
PathUtils::concatPath(s, configDir[prefType], name);
@@ -1171,7 +1173,7 @@
Firebird::Arg::StatusVector sv(from);
sv.copyTo(to);
}
- catch(const Firebird::BadAlloc& ex)
+ catch (const Firebird::BadAlloc& ex)
{
ex.stuffException(to);
}
Modified: firebird/trunk/src/dsql/DdlNodes.epp
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.epp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/DdlNodes.epp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -9900,7 +9900,7 @@
msg->getMetadata(), msg->getBuffer(), NULL, NULL);
check(s);
}
- catch(const Exception&)
+ catch (const Exception&)
{
if (st.getStatus() & IStatus::FB_HAS_ERRORS)
{
@@ -10624,7 +10624,7 @@
if (userType != obj_sql_role && userType != obj_user)
{
(Arg::Gds(isc_wish_list) << Arg::Gds(isc_random) <<
- "Only grants to USER or ROLE are supported for CREATE DATABASE").raise();
+ "Only grants to USER or ROLE are supported for CREATE DATABASE").raise();
}
CreateDbJob job(userType, user);
Modified: firebird/trunk/src/dsql/DdlNodes.h
===================================================================
--- firebird/trunk/src/dsql/DdlNodes.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/DdlNodes.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -2061,8 +2061,8 @@
struct CreateDbJob
{
CreateDbJob(SSHORT a_userType, const Firebird::MetaName& a_user)
- : allOnAll(false), grantErased(false), badGrantor(false),
- userType(a_userType), user(a_user)
+ : allOnAll(false), grantErased(false), badGrantor(false),
+ userType(a_userType), user(a_user)
{ }
bool allOnAll, grantErased, badGrantor;
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -10579,6 +10579,7 @@
{
desc->dsc_ttype() = dsqlFunction->udf_character_set_id;
+ // UNICODE_FSS_HACK
// Fix UNICODE_FSS wrong length used in system tables.
if ((dsqlFunction->udf_flags & UDF_sys_based) && (desc->dsc_ttype() == CS_UNICODE_FSS))
desc->dsc_length *= 3;
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -2842,7 +2842,8 @@
catch (const Exception& ex)
{
const bool noPriv = (ex.stuff_exception(tdbb->tdbb_status_vector) == isc_no_priv);
- trace.finish(false, noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ trace.finish(false,
+ noPriv ? Firebird::ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
EXE_unwind(tdbb, procRequest);
procRequest->req_attachment = NULL;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/dsql.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -716,7 +716,8 @@
catch (const Exception&)
{
status = tdbb->tdbb_status_vector[1];
- *traceResult = (status == isc_no_priv ? ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED);
+ *traceResult = status == isc_no_priv ?
+ ITracePlugin::TRACE_RESULT_UNAUTHORIZED : ITracePlugin::TRACE_RESULT_FAILED;
}
// restore warnings (if there are any)
Modified: firebird/trunk/src/dsql/metd.epp
===================================================================
--- firebird/trunk/src/dsql/metd.epp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/dsql/metd.epp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -919,15 +919,15 @@
userFunc->udf_character_set_id = F.RDB$CHARACTER_SET_ID;
}
- if ((!X.RDB$ARGUMENT_MECHANISM.NULL) && X.RDB$ARGUMENT_MECHANISM == prm_mech_type_of &&
- (!X.RDB$FIELD_NAME.NULL) && X.RDB$FIELD_NAME[0] &&
- (!X.RDB$RELATION_NAME.NULL) && X.RDB$RELATION_NAME[0])
+ if (!X.RDB$ARGUMENT_MECHANISM.NULL && X.RDB$ARGUMENT_MECHANISM == prm_mech_type_of &&
+ !X.RDB$FIELD_NAME.NULL && X.RDB$FIELD_NAME[0] &&
+ !X.RDB$RELATION_NAME.NULL && X.RDB$RELATION_NAME[0])
{
// type of column used in declaration
if (isSystemRelation(tdbb, transaction, X.RDB$RELATION_NAME))
userFunc->udf_flags |= UDF_sys_based;
}
- else if ((!X.RDB$FIELD_SOURCE.NULL) && X.RDB$FIELD_SOURCE[0])
+ else if (!X.RDB$FIELD_SOURCE.NULL && X.RDB$FIELD_SOURCE[0])
{
// domain used in declaration
if (isSystemDomain(tdbb, transaction, X.RDB$FIELD_SOURCE))
Modified: firebird/trunk/src/jrd/dpm.epp
===================================================================
--- firebird/trunk/src/jrd/dpm.epp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/dpm.epp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -844,9 +844,9 @@
// Data page is still empty and still in the relation. Eliminate the
// pointer to the data page then release the page.
- // here we have to look at 3 cases:
+ // here we have to look at 3 cases:
// - empty page is not a part of extent - release it as is
- // - empty page is a part of non-empty extent - mark it as empty at PP
+ // - empty page is a part of non-empty extent - mark it as empty at PP
// - empty page is a part of empty extent - release all pages of such extent
UCHAR* bits = (UCHAR*) (ppage->ppg_page + dbb->dbb_dp_per_pp);
@@ -883,7 +883,7 @@
pages.add(ppage->ppg_page[s]);
}
- if (i < PAGES_IN_EXTENT)
+ if (i < PAGES_IN_EXTENT)
{
extent = false;
pages.clear();
@@ -968,7 +968,7 @@
// Earlier, we make sure that the pointer page is written after the data
// page being released.
- PAG_release_pages(tdbb, relPages->rel_pg_space_id, pages.getCount(), pages.begin(),
+ PAG_release_pages(tdbb, relPages->rel_pg_space_id, pages.getCount(), pages.begin(),
pwindow.win_page.getPageNum());
}
@@ -1070,10 +1070,10 @@
}
const UCHAR pag_flags = ppage->ppg_header.pag_flags;
CCH_RELEASE_TAIL(tdbb, &window);
-
+
pages.add(window.win_page.getPageNum());
PAG_release_pages(tdbb, relPages->rel_pg_space_id, pages.getCount(), pages.begin(), 0);
-
+
if (pag_flags & ppg_eof)
{
break;
@@ -2647,7 +2647,7 @@
**************************************
*
* Functional description
- * Extend a relation.
+ * Extend a relation.
* This routine returns a window on the datapage locked for write
*
**************************************/
@@ -2778,7 +2778,7 @@
UCHAR* bits = (UCHAR*) (ppage->ppg_page + dbb->dbb_dp_per_pp);
PPG_DP_BIT_CLEAR(bits, slot, PPG_DP_ALL_BITS);
-
+
if (type != DPM_primary) {
PPG_DP_BIT_SET(bits, slot, ppg_dp_secondary);
}
@@ -2787,7 +2787,7 @@
{
fb_assert(ppage->ppg_page[slot + i] == 0);
ppage->ppg_page[slot + i] = firstPage.getPageNum() + i;
-
+
PPG_DP_BIT_CLEAR(bits, slot + i, PPG_DP_ALL_BITS);
PPG_DP_BIT_SET(bits, slot + i, ppg_dp_empty);
}
@@ -2932,7 +2932,7 @@
if (page->dpg_count == 1)
{
- if (type == DPM_primary)
+ if (type == DPM_primary)
page->dpg_header.pag_flags &= ~dpg_secondary;
else
page->dpg_header.pag_flags |= dpg_secondary;
@@ -3110,11 +3110,11 @@
// Look for space anywhere
// Make few tries to lock consecutive data pages without waiting. In highly
- // concurrent environment with shared page cache it could be faster then wait
+ // concurrent environment with shared page cache it could be faster then wait
// in OS for first candidate page.
int tries = dbb->dbb_config->getSharedCache() ? 8 : 0;
- USHORT pp_sequence =
+ USHORT pp_sequence =
(type == DPM_primary ? relPages->rel_pri_data_space : relPages->rel_sec_data_space);
for (;; pp_sequence++)
{
@@ -3124,7 +3124,7 @@
else
relPages->rel_sec_data_space = pp_sequence;
- const pointer_page* ppage =
+ const pointer_page* ppage =
get_pointer_page(tdbb, relation, relPages, window, pp_sequence, ppLock);
if (!ppage)
{
@@ -3154,7 +3154,7 @@
continue;
}
- // hvlad: if data page is empty, we could change its primary\secondary
+ // hvlad: if data page is empty, we could change its primary\secondary
// type as needed (i.e. to be same as "type" passed). Also, we must clear
// ppg_dp_empty bit. To do it, we need to re-fetch PP with write lock.
bool dp_is_empty = PPG_DP_BIT_TEST(bits, slot, ppg_dp_empty);
@@ -3165,12 +3165,12 @@
if (ppLock == LCK_read)
{
CCH_RELEASE(tdbb, window);
-
+
ppLock = LCK_write;
ppage = get_pointer_page(tdbb, relation, relPages, window, pp_sequence, ppLock);
if (!ppage)
BUGCHECK(254);
-
+
// retry with the same slot
slot--;
continue;
@@ -3393,7 +3393,7 @@
}
bit = PPG_DP_BIT_MASK(slot, ppg_dp_empty);
- if (dpEmpty)
+ if (dpEmpty)
{
*byte |= bit;
ppage->ppg_min_space = MIN(slot, ppage->ppg_min_space);
Modified: firebird/trunk/src/jrd/inf.cpp
===================================================================
--- firebird/trunk/src/jrd/inf.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/inf.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -628,7 +628,7 @@
case fb_info_record_warns:
case fb_info_bpage_warns:
case fb_info_dpage_warns:
- case fb_info_ipage_warns:
+ case fb_info_ipage_warns:
case fb_info_ppage_warns:
case fb_info_tpage_warns:
case fb_info_pip_errors:
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/jrd.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -6643,7 +6643,7 @@
if (!(attach->att_flags & ATT_security_db))
{
atts++;
- found = true;
+ found = true;
}
}
Modified: firebird/trunk/src/jrd/ods.cpp
===================================================================
--- firebird/trunk/src/jrd/ods.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/ods.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -102,7 +102,7 @@
{
// Compute the number of data pages per pointer page. Each data page requires
// a 32 bit pointer (BITS_PER_LONG) and a 8 bit control field (PPG_DP_BITS_NUM).
- // Also, don't allow extent of data pages (8 pages) to cross PP boundary to
+ // Also, don't allow extent of data pages (8 pages) to cross PP boundary to
// simplify code a bit.
ULONG ret = static_cast<ULONG>((page_size - offsetof(pointer_page, ppg_page[0])) * 8 / (BITS_PER_LONG + PPG_DP_BITS_NUM));
Modified: firebird/trunk/src/jrd/pag.cpp
===================================================================
--- firebird/trunk/src/jrd/pag.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/pag.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -488,8 +488,8 @@
**************************************
*
* Functional description
- * Allocate number of consecutive pages and fake a read with a write lock for
- * the first allocated page. If aligned is true, ensure first allocated page
+ * Allocate number of consecutive pages and fake a read with a write lock for
+ * the first allocated page. If aligned is true, ensure first allocated page
* is at extent boundary.
* This is the universal sequence when allocating pages.
*
@@ -510,13 +510,13 @@
ULONG sequence = (cntAlloc >= PAGES_IN_EXTENT ? pageSpace->pipWithExtent : pageSpace->pipHighWater);
for (; toAlloc > 0; sequence++)
{
- WIN pip_window(pageSpace->pageSpaceID,
+ WIN pip_window(pageSpace->pageSpaceID,
(sequence == 0) ? pageSpace->pipFirst : sequence * dbb->dbb_page_manager.pagesPerPIP - 1);
page_inv_page* pip_page = (page_inv_page*) CCH_FETCH(tdbb, &pip_window, LCK_write, pag_pages);
ULONG firstBit = MAX_ULONG, lastBit = MAX_ULONG;
-
+
ULONG pipUsed = pip_page->pip_used;
ULONG pipMin = (cntAlloc >= PAGES_IN_EXTENT ? pip_page->pip_min : dbb->dbb_page_manager.pagesPerPIP);
ULONG pipExtent = MAX_ULONG;
@@ -622,7 +622,7 @@
}
if (!toAlloc)
- break;
+ break;
}
if (!toAlloc)
@@ -630,7 +630,7 @@
fb_assert(lastBit - firstBit + 1 == cntAlloc);
if (lastBit + 1 > pipUsed) {
- pipUsed = ensureDiskSpace(tdbb, &pip_window,
+ pipUsed = ensureDiskSpace(tdbb, &pip_window,
PageNumber(pageSpace->pageSpaceID, lastBit + sequence * pageMgr.pagesPerPIP));
}
@@ -660,11 +660,11 @@
if (pipExtent == MAX_ULONG)
pipExtent = pip_page->pip_extent;
- // If we found free extent on the PIP page and allocated some pages of it,
+ // If we found free extent on the PIP page and allocated some pages of it,
// set free extent mark after just allocated pages
// assume PAGES_IN_EXTENT == 8 (i.e. one byte of bits at PIP)
const ULONG extentByte = pipExtent / PAGES_IN_EXTENT;
- if (extentByte >= firstBit / PAGES_IN_EXTENT &&
+ if (extentByte >= firstBit / PAGES_IN_EXTENT &&
extentByte <= lastBit / PAGES_IN_EXTENT)
{
pipExtent = FB_ALIGN(lastBit + 1, PAGES_IN_EXTENT);
@@ -701,7 +701,7 @@
if (pipExtent >= pageMgr.pagesPerPIP)
pageSpace->pipWithExtent.compareExchange(sequence, sequence + 1);
- if (pipMin != pip_page->pip_min || pipExtent != pip_page->pip_extent ||
+ if (pipMin != pip_page->pip_min || pipExtent != pip_page->pip_extent ||
pipUsed != pip_page->pip_used || extraPages.getCount())
{
if (toAlloc)
@@ -719,7 +719,7 @@
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES_INFO,
- "\tPAG_allocate: allocated page %"SLONGFORMAT"\n",
+ "\tPAG_allocate: allocated page %"SLONGFORMAT"\n",
bit + sequence * pageMgr.pagesPerPIP);
#endif
}
@@ -765,7 +765,7 @@
if (!(dbb->dbb_flags & DBB_no_reserve))
{
const int minExtendPages = MIN_EXTEND_BYTES / dbb->dbb_page_size;
-
+
init_pages = sequence ? 64 : MIN(pip_page->pip_used / 16, 64);
// don't touch pages belongs to the next PIP
@@ -1551,8 +1551,8 @@
* Release a page to the free page page.
*
**************************************/
-
- fb_assert(number.getPageSpaceID() == prior_page.getPageSpaceID() ||
+
+ fb_assert(number.getPageSpaceID() == prior_page.getPageSpaceID() ||
prior_page == ZERO_PAGE_NUMBER);
const ULONG pgNum = number.getPageNum();
@@ -1560,7 +1560,7 @@
}
-void PAG_release_pages(thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
+void PAG_release_pages(thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
const ULONG* pgNums, const ULONG prior_page)
{
/**************************************
@@ -1573,7 +1573,7 @@
* Release a few pages to the free page page.
*
**************************************/
-
+
SET_TDBB(tdbb);
Database* dbb = tdbb->getDatabase();
CHECK_DBB(dbb);
@@ -1588,7 +1588,7 @@
for (int i = 0; i < cntRelease; i++)
{
#ifdef VIO_DEBUG
- VIO_trace(DEBUG_WRITES_INFO,
+ VIO_trace(DEBUG_WRITES_INFO,
"\tPAG_release_pages: about to release page %"SLONGFORMAT"\n", pgNums[i]);
#endif
@@ -1596,7 +1596,7 @@
if (!pages || seq != sequence)
{
- if (pages)
+ if (pages)
{
pageSpace->pipHighWater.exchangeLower(sequence);
if (pages->pip_extent < pageMgr.pagesPerPIP)
@@ -1606,7 +1606,7 @@
}
sequence = seq;
- pip_window.win_page = (sequence == 0) ?
+ pip_window.win_page = (sequence == 0) ?
pageSpace->pipFirst : sequence * pageMgr.pagesPerPIP - 1;
pages = (page_inv_page*) CCH_FETCH(tdbb, &pip_window, LCK_write, pag_pages);
Modified: firebird/trunk/src/jrd/pag_proto.h
===================================================================
--- firebird/trunk/src/jrd/pag_proto.h 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/pag_proto.h 2014-10-12 02:25:02 UTC (rev 60104)
@@ -58,7 +58,7 @@
void PAG_init2(Jrd::thread_db*, USHORT);
SLONG PAG_last_page(Jrd::thread_db* tdbb);
void PAG_release_page(Jrd::thread_db* tdbb, const Jrd::PageNumber&, const Jrd::PageNumber&);
-void PAG_release_pages(Jrd::thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
+void PAG_release_pages(Jrd::thread_db* tdbb, USHORT pageSpaceID, int cntRelease,
const ULONG* pgNums, const ULONG prior_page);
void PAG_set_force_write(Jrd::thread_db* tdbb, bool);
void PAG_set_no_reserve(Jrd::thread_db* tdbb, bool);
Modified: firebird/trunk/src/jrd/validation.cpp
===================================================================
--- firebird/trunk/src/jrd/validation.cpp 2014-10-12 02:24:08 UTC (rev 60103)
+++ firebird/trunk/src/jrd/validation.cpp 2014-10-12 02:25:02 UTC (rev 60104)
@@ -589,28 +589,28 @@
if (bits & ppg_dp_large)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("large");
}
if (bits & ppg_dp_swept)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("swept");
}
if (bits & ppg_dp_secondary)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("secondary");
}
- if (bits & ppg_dp_empty)
+ if (bits & ppg_dp_empty)
{
- if (!names.empty())
+ if (!names.empty())
names.append(", ");
names.append("empty");
}
@@ -676,8 +676,8 @@
{true, isc_info_bpage_errors, "Blob %"SQUADFORMAT" has unknown level %d instead of {0, 1, 2}"},
{false, fb_info_ipage_warns, "Index %d has inconsistent left sibling pointer, page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT},
{false, fb_info_ipage_warns, "Index %d misses node on page %"ULONGFORMAT" level %d at offset %"ULONGFORMAT}, // 30
- {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_min (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
- {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_extent (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
+ {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_min (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
+ {false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_extent (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_pip_warns, "PIP %"ULONGFORMAT" (seq %d) have wrong pip_used (%"ULONGFORMAT"). Correct is %"ULONGFORMAT},
{false, fb_info_ppage_warns, "Pointer page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} bits {0x%02X %s} are not consistent with data page %"ULONGFORMAT" {sequence %"ULONGFORMAT"} state {0x%02X %s}"}
};
@@ -716,7 +716,7 @@
Database* dbb = tdbb->getDatabase();
Firebird::PathName fileName = tdbb->getAttachment()->att_filename;
- try
+ try
{
val_pool = dbb->createPool();
Jrd::ContextPoolHolder context(tdbb, val_pool);
@@ -751,7 +751,7 @@
cleanup();
- gds__log("Database: %s\n\tValidation finished: %d errors, %d warnings, %d fixed",
+ gds__log("Database: %s\n\tValidation finished: %d errors, %d warnings, %d fixed",
fileName.c_str(), vdr_errors, vdr_warns, vdr_fixed);
} // try
catch (const Firebird::Exception& ex)
@@ -858,7 +858,7 @@
return rtn_corrupt;
}
-Validation::FETCH_CODE Validation::fetch_page(bool mark, ULONG page_number,
+Validation::FETCH_CODE Validation::fetch_page(bool mark, ULONG page_number,
USHORT type, WIN* window, void* apage_pointer)
{
/**************************************
@@ -1081,7 +1081,7 @@
}
#endif
-Validation::RTN Validation::walk_blob(jrd_rel* relation, const blh* header, USHORT length,
+Validation::RTN Validation::walk_blob(jrd_rel* relation, const blh* header, USHORT length,
RecordNumber number)
{
/**************************************
@@ -1169,7 +1169,7 @@
return rtn_ok;
}
-Validation::RTN Validation::walk_chain(jrd_rel* relation, const rhd* header,
+Validation::RTN Validation::walk_chain(jrd_rel* relation, const rhd* header,
RecordNumber head_number)
{
/**************************************
@@ -1268,7 +1268,7 @@
CCH_RELEASE(vdr_tdbb, &window);
}
-Validation::RTN Validation::walk_data_page(jrd_rel* relation, ULONG page_number,
+Validation::RTN Validation::walk_data_page(jrd_rel* relation, ULONG page_number,
ULONG sequence, UCHAR& pp_bits)
{
/**************************************
@@ -1308,7 +1308,7 @@
// Evaluate what flags should be set on PP
- if (dp_flags & dpg_full)
+ if (dp_flags & dpg_full)
pp_bits |= ppg_dp_full;
if (dp_flags & dpg_large)
@@ -1908,8 +1908,8 @@
if (*bytes == 0xFF && pipExtent == MAX_ULONG)
pipExtent = (bytes - page->pip_bits) * 8;
-
- if (pipMin == MAX_ULONG)
+
+ if (pipMin == MAX_ULONG)
{
UCHAR mask = 1;
for (int i = 0; i < 8; i++, mask <<= 1)
@@ -1945,19 +1945,19 @@
}
bool fixme = false;
- if (pipMin < page->pip_min)
+ if (pipMin < page->pip_min)
{
corrupt(VAL_PIP_WRONG_MIN, NULL, page_number, sequence, page->pip_min, pipMin);
fixme = (vdr_flags & VDR_update);
}
- if (pipExtent < page->pip_extent)
+ if (pipExtent < page->pip_extent)
{
corrupt(VAL_PIP_WRONG_EXTENT, NULL, page_number, sequence, page->pip_extent, pipExtent);
fixme = (vdr_flags & VDR_update);
}
- if (pipUsed > page->pip_used)
+ if (pipUsed > page->pip_used)
{
corrupt(VAL_PIP_WRONG_USED, NULL, page_number, sequence, page->pip_used, pipUsed);
fixme = (vdr_flags & VDR_update);
@@ -2064,8 +2064,8 @@
explain_pp_bits(pp_bits, s_pp);
explain_pp_bits(new_pp_bits, s_dp);
- corrupt(VAL_P_PAGE_WRONG_BITS, relation,
- page->ppg_header.pag_pageno, sequence, pp_bits, s_pp.c_str(),
+ corrupt(VAL_P_PAGE_WRONG_BITS, relation,
+ page->ppg_header.pag_pageno, sequence, pp_bits, s_pp.c_str(),
*pages, seq, new_pp_bits, s_dp.c_str());
if ((vdr_flags & VDR_update))
@@ -2105,7 +2105,7 @@
}
-Validation::RTN Validation::walk_record(jrd_rel* relation, const rhd* header, USHORT length,
+Validation::RTN Validation::walk_record(jrd_rel* relation, const rhd* header, USHORT length,
RecordNumber number, bool delta_flag)
{
/**************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-13 01:19:49
|
Revision: 60108
http://sourceforge.net/p/firebird/code/60108
Author: firebirds
Date: 2014-10-13 01:19:39 +0000 (Mon, 13 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-12 19:33:09 UTC (rev 60107)
+++ firebird/trunk/ChangeLog 2014-10-13 01:19:39 UTC (rev 60108)
@@ -1,3 +1,48 @@
+ 2014-10-12 19:33 asfernandes
+ M src/jrd/UserManagement.cpp
+ M src/jrd/UserManagement.h
+ M src/jrd/dpm.epp
+Misc.
+
+ 2014-10-12 18:47 asfernandes
+ M src/isql/isql.epp
+ M src/jrd/Database.cpp
+ M src/jrd/trace/TraceDSQLHelpers.h
+ M src/jrd/trace/TraceJrdHelpers.h
+Misc.
+
+ 2014-10-12 18:24 dimitr
+ M src/jrd/build_no.h
+ M src/misc/writeBuildNum.sh
+Updated the version info.
+
+ 2014-10-12 02:25 asfernandes
+ M examples/interfaces/04.print_table.cpp
+ M src/alice/alice.h
+ M src/alice/exe.cpp
+ M src/common/StatusHolder.h
+ M src/common/isc_sync.cpp
+ M src/common/unicode_util.cpp
+ M src/common/utils.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/dsql.cpp
+ M src/dsql/metd.epp
+ M src/jrd/dpm.epp
+ M src/jrd/inf.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/ods.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/pag_proto.h
+ M src/jrd/validation.cpp
+Misc.
+
+ 2014-10-12 02:24 asfernandes
+ M src/common/call_service.cpp
+Correction.
+
2014-10-11 19:17 dimitr
M doc/WhatsNew
Updated the docs.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-12 19:33:09 UTC (rev 60107)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-13 01:19:39 UTC (rev 60108)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31364
+ FORMAL BUILD NUMBER:31369
*/
-#define PRODUCT_VER_STRING "3.0.0.31364"
-#define FILE_VER_STRING "WI-T3.0.0.31364"
-#define LICENSE_VER_STRING "WI-T3.0.0.31364"
-#define FILE_VER_NUMBER 3, 0, 0, 31364
+#define PRODUCT_VER_STRING "3.0.0.31369"
+#define FILE_VER_STRING "WI-T3.0.0.31369"
+#define LICENSE_VER_STRING "WI-T3.0.0.31369"
+#define FILE_VER_NUMBER 3, 0, 0, 31369
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31364"
+#define FB_BUILD_NO "31369"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-12 19:33:09 UTC (rev 60107)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-13 01:19:39 UTC (rev 60108)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31364
+BuildNum=31369
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-14 01:20:56
|
Revision: 60112
http://sourceforge.net/p/firebird/code/60112
Author: firebirds
Date: 2014-10-14 01:20:53 +0000 (Tue, 14 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-13 15:29:21 UTC (rev 60111)
+++ firebird/trunk/ChangeLog 2014-10-14 01:20:53 UTC (rev 60112)
@@ -1,3 +1,11 @@
+ 2014-10-13 15:29 alexpeshkoff
+ M src/jrd/validation.h
+Misc const correctness - fixed warning
+
+ 2014-10-13 09:30 alexpeshkoff
+ M src/yvalve/MasterImplementation.cpp
+Fixed search for free circullar buffer when using LWP number as thread id
+
2014-10-12 19:33 asfernandes
M src/jrd/UserManagement.cpp
M src/jrd/UserManagement.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-13 15:29:21 UTC (rev 60111)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-14 01:20:53 UTC (rev 60112)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31369
+ FORMAL BUILD NUMBER:31371
*/
-#define PRODUCT_VER_STRING "3.0.0.31369"
-#define FILE_VER_STRING "WI-T3.0.0.31369"
-#define LICENSE_VER_STRING "WI-T3.0.0.31369"
-#define FILE_VER_NUMBER 3, 0, 0, 31369
+#define PRODUCT_VER_STRING "3.0.0.31371"
+#define FILE_VER_STRING "WI-T3.0.0.31371"
+#define LICENSE_VER_STRING "WI-T3.0.0.31371"
+#define FILE_VER_NUMBER 3, 0, 0, 31371
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31369"
+#define FB_BUILD_NO "31371"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-13 15:29:21 UTC (rev 60111)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-14 01:20:53 UTC (rev 60112)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31369
+BuildNum=31371
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-15 01:21:03
|
Revision: 60118
http://sourceforge.net/p/firebird/code/60118
Author: firebirds
Date: 2014-10-15 01:20:55 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-14 13:42:29 UTC (rev 60117)
+++ firebird/trunk/ChangeLog 2014-10-15 01:20:55 UTC (rev 60118)
@@ -1,3 +1,15 @@
+ 2014-10-14 13:36 alexpeshkoff
+ M src/common/isc_sync.cpp
+Fixed Mac port
+
+ 2014-10-14 10:21 alexpeshkoff
+ M src/yvalve/why.cpp
+One more segfault in old API emulation
+
+ 2014-10-14 07:31 hvlad
+ M src/common/StatusArg.cpp
+Fixed wrong item "unknown ISC error 0" in error messages
+
2014-10-13 15:29 alexpeshkoff
M src/jrd/validation.h
Misc const correctness - fixed warning
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-14 13:42:29 UTC (rev 60117)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-15 01:20:55 UTC (rev 60118)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31371
+ FORMAL BUILD NUMBER:31374
*/
-#define PRODUCT_VER_STRING "3.0.0.31371"
-#define FILE_VER_STRING "WI-T3.0.0.31371"
-#define LICENSE_VER_STRING "WI-T3.0.0.31371"
-#define FILE_VER_NUMBER 3, 0, 0, 31371
+#define PRODUCT_VER_STRING "3.0.0.31374"
+#define FILE_VER_STRING "WI-T3.0.0.31374"
+#define LICENSE_VER_STRING "WI-T3.0.0.31374"
+#define FILE_VER_NUMBER 3, 0, 0, 31374
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31371"
+#define FB_BUILD_NO "31374"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-14 13:42:29 UTC (rev 60117)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-15 01:20:55 UTC (rev 60118)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31371
+BuildNum=31374
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-16 01:31:54
|
Revision: 60123
http://sourceforge.net/p/firebird/code/60123
Author: firebirds
Date: 2014-10-16 01:31:45 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-15 15:45:35 UTC (rev 60122)
+++ firebird/trunk/ChangeLog 2014-10-16 01:31:45 UTC (rev 60123)
@@ -1,3 +1,21 @@
+ 2014-10-15 15:45 asfernandes
+ D src/include/FirebirdApi.h
+Really remove the file now :).
+
+ 2014-10-15 15:43 asfernandes
+ M src/include/firebird/Interface.h
+Misc.
+
+ 2014-10-15 15:43 asfernandes
+ M src/include/FirebirdApi.h
+ M src/jrd/ExtEngineManager.h
+ M src/jrd/jrd.cpp
+Remove obsolete header file.
+
+ 2014-10-15 11:52 alexpeshkoff
+ M src/yvalve/MasterImplementation.cpp
+Use thread destructor function to free string buffer after thread completion
+
2014-10-14 13:36 alexpeshkoff
M src/common/isc_sync.cpp
Fixed Mac port
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-15 15:45:35 UTC (rev 60122)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-16 01:31:45 UTC (rev 60123)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31374
+ FORMAL BUILD NUMBER:31378
*/
-#define PRODUCT_VER_STRING "3.0.0.31374"
-#define FILE_VER_STRING "WI-T3.0.0.31374"
-#define LICENSE_VER_STRING "WI-T3.0.0.31374"
-#define FILE_VER_NUMBER 3, 0, 0, 31374
+#define PRODUCT_VER_STRING "3.0.0.31378"
+#define FILE_VER_STRING "WI-T3.0.0.31378"
+#define LICENSE_VER_STRING "WI-T3.0.0.31378"
+#define FILE_VER_NUMBER 3, 0, 0, 31378
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31374"
+#define FB_BUILD_NO "31378"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-15 15:45:35 UTC (rev 60122)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-16 01:31:45 UTC (rev 60123)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31374
+BuildNum=31378
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-17 01:19:42
|
Revision: 60133
http://sourceforge.net/p/firebird/code/60133
Author: firebirds
Date: 2014-10-17 01:19:32 +0000 (Fri, 17 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-16 16:35:18 UTC (rev 60132)
+++ firebird/trunk/ChangeLog 2014-10-17 01:19:32 UTC (rev 60133)
@@ -1,3 +1,36 @@
+ 2014-10-16 16:35 dimitr
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/StmtNodes.h
+ M src/dsql/parse.y
+ M src/jrd/blr.h
+ M src/yvalve/gds.cpp
+Improvement CORE-3526: Support for WHEN SQLSTATE.
+
+ 2014-10-16 15:16 alexpeshkoff
+ M src/isql/InputDevices.cpp
+ M src/isql/isql.epp
+Fixed CORE-4578: INPUT file not properly closed
+
+ 2014-10-16 12:42 alexpeshkoff
+ M builds/install/arch-specific/linux/makeInstallImage.sh.in
+Resolved packaging issue - added boost files to linux binary package
+
+ 2014-10-16 11:31 alexpeshkoff
+ M src/jrd/cch.cpp
+ M src/jrd/cch_proto.h
+ M src/jrd/jrd.cpp
+Fixed CORE-4582: Within linger period one can not change some database properties
+
+ 2014-10-16 10:36 alexpeshkoff
+ M examples/dbcrypt/CryptApplication.cpp
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+Fixed build errors
+
+ 2014-10-16 07:32 dimitr
+ M doc/WhatsNew
+Added missing parts of the docs.
+
2014-10-15 15:45 asfernandes
D src/include/FirebirdApi.h
Really remove the file now :).
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-16 16:35:18 UTC (rev 60132)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-17 01:19:32 UTC (rev 60133)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31378
+ FORMAL BUILD NUMBER:31384
*/
-#define PRODUCT_VER_STRING "3.0.0.31378"
-#define FILE_VER_STRING "WI-T3.0.0.31378"
-#define LICENSE_VER_STRING "WI-T3.0.0.31378"
-#define FILE_VER_NUMBER 3, 0, 0, 31378
+#define PRODUCT_VER_STRING "3.0.0.31384"
+#define FILE_VER_STRING "WI-T3.0.0.31384"
+#define LICENSE_VER_STRING "WI-T3.0.0.31384"
+#define FILE_VER_NUMBER 3, 0, 0, 31384
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31378"
+#define FB_BUILD_NO "31384"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-16 16:35:18 UTC (rev 60132)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-17 01:19:32 UTC (rev 60133)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31378
+BuildNum=31384
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-22 01:19:49
|
Revision: 60136
http://sourceforge.net/p/firebird/code/60136
Author: firebirds
Date: 2014-10-22 01:19:40 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-21 14:53:23 UTC (rev 60135)
+++ firebird/trunk/ChangeLog 2014-10-22 01:19:40 UTC (rev 60136)
@@ -1,3 +1,8 @@
+ 2014-10-21 14:53 hvlad
+ M src/jrd/cch.cpp
+Improved page cache performance a bit.
+The case when page buffer is evicted and re-assigned to another page.
+
2014-10-16 16:35 dimitr
M src/dsql/StmtNodes.cpp
M src/dsql/StmtNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-21 14:53:23 UTC (rev 60135)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-22 01:19:40 UTC (rev 60136)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31384
+ FORMAL BUILD NUMBER:31385
*/
-#define PRODUCT_VER_STRING "3.0.0.31384"
-#define FILE_VER_STRING "WI-T3.0.0.31384"
-#define LICENSE_VER_STRING "WI-T3.0.0.31384"
-#define FILE_VER_NUMBER 3, 0, 0, 31384
+#define PRODUCT_VER_STRING "3.0.0.31385"
+#define FILE_VER_STRING "WI-T3.0.0.31385"
+#define LICENSE_VER_STRING "WI-T3.0.0.31385"
+#define FILE_VER_NUMBER 3, 0, 0, 31385
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31384"
+#define FB_BUILD_NO "31385"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-21 14:53:23 UTC (rev 60135)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-22 01:19:40 UTC (rev 60136)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31384
+BuildNum=31385
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-26 01:09:45
|
Revision: 60138
http://sourceforge.net/p/firebird/code/60138
Author: firebirds
Date: 2014-10-26 01:09:36 +0000 (Sun, 26 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-25 18:39:45 UTC (rev 60137)
+++ firebird/trunk/ChangeLog 2014-10-26 01:09:36 UTC (rev 60138)
@@ -1,3 +1,25 @@
+ 2014-10-25 18:39 asfernandes
+ M src/jrd/exe.cpp
+ M src/jrd/fun.epp
+ M src/jrd/jrd.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/svc.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/validation.cpp
+ M src/msgs/messages2.sql
+ M src/remote/client/interface.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+ M src/remote/server/server.cpp
+ M src/utilities/gstat/dba.epp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/traceplugin.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/PluginManager.cpp
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Misc.
+
2014-10-21 14:53 hvlad
M src/jrd/cch.cpp
Improved page cache performance a bit.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-25 18:39:45 UTC (rev 60137)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-26 01:09:36 UTC (rev 60138)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31385
+ FORMAL BUILD NUMBER:31386
*/
-#define PRODUCT_VER_STRING "3.0.0.31385"
-#define FILE_VER_STRING "WI-T3.0.0.31385"
-#define LICENSE_VER_STRING "WI-T3.0.0.31385"
-#define FILE_VER_NUMBER 3, 0, 0, 31385
+#define PRODUCT_VER_STRING "3.0.0.31386"
+#define FILE_VER_STRING "WI-T3.0.0.31386"
+#define LICENSE_VER_STRING "WI-T3.0.0.31386"
+#define FILE_VER_NUMBER 3, 0, 0, 31386
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31385"
+#define FB_BUILD_NO "31386"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-25 18:39:45 UTC (rev 60137)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-26 01:09:36 UTC (rev 60138)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31385
+BuildNum=31386
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-29 01:06:31
|
Revision: 60142
http://sourceforge.net/p/firebird/code/60142
Author: firebirds
Date: 2014-10-29 01:06:22 +0000 (Wed, 29 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-28 13:49:39 UTC (rev 60141)
+++ firebird/trunk/ChangeLog 2014-10-29 01:06:22 UTC (rev 60142)
@@ -1,3 +1,8 @@
+ 2014-10-28 13:41 alexpeshkoff
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+Fixed a bug in unofficial release of beta1 reported by Martijn in devel - missing security context error when using separate SecurityDatabase
+
2014-10-25 18:39 asfernandes
M src/jrd/exe.cpp
M src/jrd/fun.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-28 13:49:39 UTC (rev 60141)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-29 01:06:22 UTC (rev 60142)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31386
+ FORMAL BUILD NUMBER:31387
*/
-#define PRODUCT_VER_STRING "3.0.0.31386"
-#define FILE_VER_STRING "WI-T3.0.0.31386"
-#define LICENSE_VER_STRING "WI-T3.0.0.31386"
-#define FILE_VER_NUMBER 3, 0, 0, 31386
+#define PRODUCT_VER_STRING "3.0.0.31387"
+#define FILE_VER_STRING "WI-T3.0.0.31387"
+#define LICENSE_VER_STRING "WI-T3.0.0.31387"
+#define FILE_VER_NUMBER 3, 0, 0, 31387
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31386"
+#define FB_BUILD_NO "31387"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-28 13:49:39 UTC (rev 60141)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-29 01:06:22 UTC (rev 60142)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31386
+BuildNum=31387
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-30 01:03:40
|
Revision: 60145
http://sourceforge.net/p/firebird/code/60145
Author: firebirds
Date: 2014-10-30 01:03:31 +0000 (Thu, 30 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-29 17:43:22 UTC (rev 60144)
+++ firebird/trunk/ChangeLog 2014-10-30 01:03:31 UTC (rev 60145)
@@ -1,3 +1,13 @@
+ 2014-10-29 17:43 mkubecek
+ M src/remote/inet.cpp
+Fixed CORE-4586: connections to FB3 in "standaloneClassic" mode (firebird -s) hang up
+
+ 2014-10-29 09:04 paulbeach
+ M builds/posix/darwin.defaults
+ M builds/posix/prefix.darwin_x86_64
+ M builds/posix/udr_engine.vers
+Build modifications for MacOSX/Clang
+
2014-10-28 13:41 alexpeshkoff
M src/remote/remote.h
M src/remote/server/server.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-29 17:43:22 UTC (rev 60144)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-30 01:03:31 UTC (rev 60145)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31387
+ FORMAL BUILD NUMBER:31389
*/
-#define PRODUCT_VER_STRING "3.0.0.31387"
-#define FILE_VER_STRING "WI-T3.0.0.31387"
-#define LICENSE_VER_STRING "WI-T3.0.0.31387"
-#define FILE_VER_NUMBER 3, 0, 0, 31387
+#define PRODUCT_VER_STRING "3.0.0.31389"
+#define FILE_VER_STRING "WI-T3.0.0.31389"
+#define LICENSE_VER_STRING "WI-T3.0.0.31389"
+#define FILE_VER_NUMBER 3, 0, 0, 31389
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31387"
+#define FB_BUILD_NO "31389"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-29 17:43:22 UTC (rev 60144)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-30 01:03:31 UTC (rev 60145)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31387
+BuildNum=31389
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-10-31 01:01:22
|
Revision: 60148
http://sourceforge.net/p/firebird/code/60148
Author: firebirds
Date: 2014-10-31 01:01:18 +0000 (Fri, 31 Oct 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-30 08:03:14 UTC (rev 60147)
+++ firebird/trunk/ChangeLog 2014-10-31 01:01:18 UTC (rev 60148)
@@ -1,3 +1,7 @@
+ 2014-10-30 08:03 paulbeach
+ M builds/posix/prefix.darwin_x86_64
+Typo
+
2014-10-29 17:43 mkubecek
M src/remote/inet.cpp
Fixed CORE-4586: connections to FB3 in "standaloneClassic" mode (firebird -s) hang up
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-30 08:03:14 UTC (rev 60147)
+++ firebird/trunk/src/jrd/build_no.h 2014-10-31 01:01:18 UTC (rev 60148)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31389
+ FORMAL BUILD NUMBER:31390
*/
-#define PRODUCT_VER_STRING "3.0.0.31389"
-#define FILE_VER_STRING "WI-T3.0.0.31389"
-#define LICENSE_VER_STRING "WI-T3.0.0.31389"
-#define FILE_VER_NUMBER 3, 0, 0, 31389
+#define PRODUCT_VER_STRING "3.0.0.31390"
+#define FILE_VER_STRING "WI-T3.0.0.31390"
+#define LICENSE_VER_STRING "WI-T3.0.0.31390"
+#define FILE_VER_NUMBER 3, 0, 0, 31390
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31389"
+#define FB_BUILD_NO "31390"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-30 08:03:14 UTC (rev 60147)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-10-31 01:01:18 UTC (rev 60148)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31389
+BuildNum=31390
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-11-01 01:00:58
|
Revision: 60154
http://sourceforge.net/p/firebird/code/60154
Author: firebirds
Date: 2014-11-01 01:00:48 +0000 (Sat, 01 Nov 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-10-31 17:43:27 UTC (rev 60153)
+++ firebird/trunk/ChangeLog 2014-11-01 01:00:48 UTC (rev 60154)
@@ -1,3 +1,14 @@
+ 2014-10-31 16:16 paul_reeves
+ M builds/install/misc/firebird.conf.in
+Clearly mark the beginning of the architecture configuration section.
+
+ 2014-10-31 10:14 dimitr
+ D B2_5_Replication
+Removed accidentally wrong commit.
+
+ 2014-10-31 10:10 dimitr
+ A B2_5_Replication
+
2014-10-30 08:03 paulbeach
M builds/posix/prefix.darwin_x86_64
Typo
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-10-31 17:43:27 UTC (rev 60153)
+++ firebird/trunk/src/jrd/build_no.h 2014-11-01 01:00:48 UTC (rev 60154)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31390
+ FORMAL BUILD NUMBER:31393
*/
-#define PRODUCT_VER_STRING "3.0.0.31390"
-#define FILE_VER_STRING "WI-T3.0.0.31390"
-#define LICENSE_VER_STRING "WI-T3.0.0.31390"
-#define FILE_VER_NUMBER 3, 0, 0, 31390
+#define PRODUCT_VER_STRING "3.0.0.31393"
+#define FILE_VER_STRING "WI-T3.0.0.31393"
+#define LICENSE_VER_STRING "WI-T3.0.0.31393"
+#define FILE_VER_NUMBER 3, 0, 0, 31393
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31390"
+#define FB_BUILD_NO "31393"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-10-31 17:43:27 UTC (rev 60153)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-11-01 01:00:48 UTC (rev 60154)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31390
+BuildNum=31393
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2014-11-04 01:08:47
|
Revision: 60170
http://sourceforge.net/p/firebird/code/60170
Author: firebirds
Date: 2014-11-04 01:08:44 +0000 (Tue, 04 Nov 2014)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2014-11-03 09:35:57 UTC (rev 60169)
+++ firebird/trunk/ChangeLog 2014-11-04 01:08:44 UTC (rev 60170)
@@ -1,3 +1,8 @@
+ 2014-11-03 09:17 mapopa
+ M src/utilities/guard/guard.cpp
+ M src/utilities/guard/util.cpp
+Apply CORE-4595 fbguard lock file permission patch
+
2014-10-31 16:16 paul_reeves
M builds/install/misc/firebird.conf.in
Clearly mark the beginning of the architecture configuration section.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2014-11-03 09:35:57 UTC (rev 60169)
+++ firebird/trunk/src/jrd/build_no.h 2014-11-04 01:08:44 UTC (rev 60170)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31393
+ FORMAL BUILD NUMBER:31394
*/
-#define PRODUCT_VER_STRING "3.0.0.31393"
-#define FILE_VER_STRING "WI-T3.0.0.31393"
-#define LICENSE_VER_STRING "WI-T3.0.0.31393"
-#define FILE_VER_NUMBER 3, 0, 0, 31393
+#define PRODUCT_VER_STRING "3.0.0.31394"
+#define FILE_VER_STRING "WI-T3.0.0.31394"
+#define LICENSE_VER_STRING "WI-T3.0.0.31394"
+#define FILE_VER_NUMBER 3, 0, 0, 31394
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31393"
+#define FB_BUILD_NO "31394"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2014-11-03 09:35:57 UTC (rev 60169)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2014-11-04 01:08:44 UTC (rev 60170)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31393
+BuildNum=31394
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X