From: <fir...@us...> - 2011-12-24 03:20:33
|
Revision: 53749 http://firebird.svn.sourceforge.net/firebird/?rev=53749&view=rev Author: firebirds Date: 2011-12-24 03:20:25 +0000 (Sat, 24 Dec 2011) 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 2011-12-23 18:33:23 UTC (rev 53748) +++ firebird/trunk/ChangeLog 2011-12-24 03:20:25 UTC (rev 53749) @@ -1,3 +1,148 @@ + 2011-12-23 18:33 dimitr + M src/remote/client/interface.cpp + M src/remote/inet.cpp + M src/remote/os/win32/wnet.cpp + M src/remote/os/win32/wnet_proto.h + M src/remote/os/win32/xnet.cpp + M src/remote/os/win32/xnet_proto.h +Fixed some compilation errors. + + 2011-12-23 18:13 dimitr + M src/jrd/cch.cpp +Methinks this solution should be a bit better, as it doesn't overwrite the pending error code (happened in PIO). + + 2011-12-23 17:59 dimitr + M src/remote/remote.h +Correction. + + 2011-12-23 17:55 dimitr + M src/jrd/tra.cpp +Cleanup. + + 2011-12-23 17:50 dimitr + M src/common/config/config.cpp + M src/common/config/config.h + M src/lock/lock.cpp + M src/lock/lock_proto.h + M src/lock/print.cpp +Make locks unconditionally granted in the fair order. The legacy behavior is unsafe in the highly loaded systems. + + 2011-12-23 17:47 dimitr + M builds/install/misc/firebird.conf.in +Make locks unconditionally granted in the fair order. The legacy behavior is unsafe in the highly loaded systems. + + 2011-12-23 17:11 dimitr + M src/jrd/cch.cpp +Fixed the assertions caused by the isc_lock_conflict error left in the status vector after successful execution of the API call. + + 2011-12-23 17:08 dimitr + M src/jrd/lck.cpp +Fixed the lock owners accordingly to the per-attachment metadata caches. + + 2011-12-23 17:07 dimitr + M src/lock/lock.cpp + M src/lock/lock_proto.h + M src/lock/print.cpp +Allowed multiple waiting requests per owner. This resolves various crashes and asserts in the SharedDatabase + SharedCache mode. Page-level deadlocks are still expected, the cache manager needs fixing. +Also, made the lock table synchronization a bit stricter. Some refactoring and cleanup was performed as well. + + 2011-12-23 12:43 alexpeshkoff + M builds/install/arch-specific/linux/misc/linuxLibrary.sh.in + M builds/install/arch-specific/linux/misc/postinstall.sh.in + M builds/install/misc/posixLibrary.sh.in + M builds/posix/Makefile.in + M builds/posix/make.defaults + M builds/posix/make.shared.variables + M configure.in + M lang_helpers/gds_codes.ftn + M lang_helpers/gds_codes.pas + M src/auth/AuthDbg.cpp + M src/auth/AuthDbg.h + D src/auth/AuthInterface.h + A src/auth/SecureRemotePassword + A src/auth/SecureRemotePassword/BigInteger.cpp + A src/auth/SecureRemotePassword/BigInteger.h + A src/auth/SecureRemotePassword/Message.h + A src/auth/SecureRemotePassword/client + A src/auth/SecureRemotePassword/client/SrpClient.cpp + A src/auth/SecureRemotePassword/client/SrpClient.h + A src/auth/SecureRemotePassword/manage + A src/auth/SecureRemotePassword/manage/SrpManagement.cpp + A src/auth/SecureRemotePassword/misc + A src/auth/SecureRemotePassword/misc/prime.cpp + A src/auth/SecureRemotePassword/misc/test.sh + A src/auth/SecureRemotePassword/misc/test_srp.cpp + A src/auth/SecureRemotePassword/server + A src/auth/SecureRemotePassword/server/SrpServer.cpp + A src/auth/SecureRemotePassword/server/SrpServer.h + A src/auth/SecureRemotePassword/srp.cpp + A src/auth/SecureRemotePassword/srp.h + M src/auth/SecurityDatabase/LegacyClient.cpp + M src/auth/SecurityDatabase/LegacyClient.h + M src/auth/SecurityDatabase/LegacyHash.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.cpp + M src/common/Auth.h + M src/common/classes/ClumpletReader.cpp + M src/common/classes/ClumpletReader.h + M src/common/classes/ClumpletWriter.cpp + M src/common/classes/ClumpletWriter.h + M src/common/classes/GetPlugins.h + M src/common/classes/array.h + M src/common/common.h + M src/common/config/config.cpp + M src/common/security.h + M src/common/sha.cpp + M src/common/sha.h + M src/common/thd.cpp + M src/common/utils.cpp + M src/common/utils_proto.h + M src/include/consts_pub.h + A src/include/firebird/Auth.h (from /firebird/trunk/src/auth/AuthInterface.h:53609) + M src/include/firebird/Plugin.h + M src/include/firebird/Provider.h + M src/include/gen/codetext.h + M src/include/gen/iberror.h + M src/include/gen/msgs.h + M src/include/gen/sql_code.h + M src/include/gen/sql_state.h + M src/jrd/SysFunction.cpp + M src/jrd/UserManagement.h + M src/jrd/jrd.cpp + M src/jrd/svc.cpp + M src/jrd/tra.cpp + M src/jrd/trace/TraceCmdLine.cpp + M src/jrd/trace/TraceManager.h + M src/msgs/facilities2.sql + M src/msgs/messages2.sql + M src/msgs/system_errors2.sql + A src/plugins/crypt + A src/plugins/crypt/arc4 + M src/remote/client/interface.cpp + M src/remote/inet.cpp + M src/remote/inet_proto.h + M src/remote/os/win32/wnet.cpp + M src/remote/protocol.cpp + M src/remote/protocol.h + M src/remote/remot_proto.h + M src/remote/remote.cpp + M src/remote/remote.h + M src/remote/server/os/posix/inet_server.cpp + M src/remote/server/server.cpp + M src/utilities/gsec/gsec.cpp + M src/utilities/gsec/gsec_proto.h + M src/utilities/gstat/dba.epp + M src/yvalve/DistributedTransaction.cpp + M src/yvalve/PluginManager.cpp + M src/yvalve/PluginManager.h + M src/yvalve/why.cpp +Fixed CORE-1898: Increase the password length from 8 characters, CORE-3372: Simplify process of non-default security database creation + 2011-12-22 15:32 dimitr M src/include/consts_pub.h M src/jrd/jrd.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-23 18:33:23 UTC (rev 53748) +++ firebird/trunk/src/jrd/build_no.h 2011-12-24 03:20:25 UTC (rev 53749) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29651 + FORMAL BUILD NUMBER:29661 */ -#define PRODUCT_VER_STRING "3.0.0.29651" -#define FILE_VER_STRING "WI-T3.0.0.29651" -#define LICENSE_VER_STRING "WI-T3.0.0.29651" -#define FILE_VER_NUMBER 3, 0, 0, 29651 +#define PRODUCT_VER_STRING "3.0.0.29661" +#define FILE_VER_STRING "WI-T3.0.0.29661" +#define LICENSE_VER_STRING "WI-T3.0.0.29661" +#define FILE_VER_NUMBER 3, 0, 0, 29661 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29651" +#define FB_BUILD_NO "29661" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-23 18:33:23 UTC (rev 53748) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-24 03:20:25 UTC (rev 53749) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29651 +BuildNum=29661 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...> - 2011-12-24 18:08:21
|
Revision: 53751 http://firebird.svn.sourceforge.net/firebird/?rev=53751&view=rev Author: asfernandes Date: 2011-12-24 18:08:13 +0000 (Sat, 24 Dec 2011) Log Message: ----------- Misc. Modified Paths: -------------- firebird/trunk/builds/posix/Makefile.in firebird/trunk/doc/sql.extensions/README.builtin_functions.txt firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp firebird/trunk/src/auth/SecureRemotePassword/srp.cpp firebird/trunk/src/auth/SecureRemotePassword/srp.h firebird/trunk/src/auth/SecurityDatabase/LegacyHash.h firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp firebird/trunk/src/common/classes/GetPlugins.h firebird/trunk/src/common/sha.cpp firebird/trunk/src/dsql/parse.y firebird/trunk/src/include/firebird/Provider.h firebird/trunk/src/lock/lock.cpp Modified: firebird/trunk/builds/posix/Makefile.in =================================================================== --- firebird/trunk/builds/posix/Makefile.in 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/builds/posix/Makefile.in 2011-12-24 18:08:13 UTC (rev 53751) @@ -359,7 +359,7 @@ # plugins - some of them are required to build examples, use separate entry for them # -.PHONY: udr legacy_user_management trace auth_debug +.PHONY: udr legacy_user_management trace auth_debug makePluginName= $(PLUGINS)/$(LIB_PREFIX)$(1).$(SHRLIB_EXT) UDR_PLUGIN = $(call makePluginName,udr_engine) LEGACY_USER_MANAGER = $(call makePluginName,Legacy_UserManager) Modified: firebird/trunk/doc/sql.extensions/README.builtin_functions.txt =================================================================== --- firebird/trunk/doc/sql.extensions/README.builtin_functions.txt 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/doc/sql.extensions/README.builtin_functions.txt 2011-12-24 18:08:13 UTC (rev 53751) @@ -247,7 +247,7 @@ CHAR_TO_UUID( <string> ) Notes: - If you have not used this function before, its usage is discouraged. CHAR_TO_UUID2 superseds it. + If you have not used this function before, its usage is discouraged. CHAR_TO_UUID2 supersedes it. Example: select char_to_uuid('93519227-8D50-4E47-81AA-8F6678C096A1') from rdb$database; @@ -268,7 +268,7 @@ CHAR_TO_UUID2( <string> ) Notes: - This function superseds CHAR_TO_UUID. The difference between them is that CHAR_TO_UUID does a + This function supersedes CHAR_TO_UUID. The difference between them is that CHAR_TO_UUID does a byte-by-byte conversion of the ASCII string to the OCTETS one, while CHAR_TO_UUID2 converts a RFC-4122 compliant ASCII UUID to a compliant OCTETS string. @@ -874,7 +874,7 @@ UUID_TO_CHAR( <string> ) Notes: - If you have not used this function before, its usage is discouraged. UUID_TO_CHAR2 superseds it. + If you have not used this function before, its usage is discouraged. UUID_TO_CHAR2 supersedes it. Example: select uuid_to_char(gen_uuid()) from rdb$database; @@ -894,7 +894,7 @@ UUID_TO_CHAR2( <string> ) Notes: - This function superseds UUID_TO_CHAR. The difference between them is that UUID_TO_CHAR does a + This function supersedes UUID_TO_CHAR. The difference between them is that UUID_TO_CHAR does a byte-by-byte conversion of the OCTETS string to the ASCII one, while UUID_TO_CHAR2 converts a RFC-4122 compliant OCTETS UUID to a compliant ASCII string. Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -34,18 +34,17 @@ namespace Auth { -class SrpClient : public Firebird::StdPlugin<IClient, FB_AUTH_CLIENT_VERSION> +class SrpClient : public StdPlugin<IClient, FB_AUTH_CLIENT_VERSION> { public: - explicit SrpClient(Firebird::IPluginConfig*) + explicit SrpClient(IPluginConfig*) : client(NULL), data(getPool()), sessionKey(getPool()) { } // IClient implementation - Result FB_CARG authenticate(Firebird::IStatus*, IClientBlock* cb); - Result FB_CARG getSessionKey(Firebird::IStatus* status, - const unsigned char** key, unsigned int* keyLen); + Result FB_CARG authenticate(IStatus*, IClientBlock* cb); + Result FB_CARG getSessionKey(IStatus* status, const unsigned char** key, unsigned int* keyLen); int FB_CARG release(); private: @@ -54,14 +53,14 @@ UCharBuffer sessionKey; }; -Result SrpClient::authenticate(Firebird::IStatus* status, IClientBlock* cb) +Result SrpClient::authenticate(IStatus* status, IClientBlock* cb) { try { if (sessionKey.hasData()) { // Why are we called when auth is completed? - (Firebird::Arg::Gds(isc_random) << "Auth sync failure - SRP's authenticate called more times than supported").raise(); + (Arg::Gds(isc_random) << "Auth sync failure - SRP's authenticate called more times than supported").raise(); } if (!client) @@ -91,7 +90,7 @@ string salt, key; unsigned charSize = *saltAndKey++; - charSize += ((unsigned)*saltAndKey++) << 8; + charSize += ((unsigned) *saltAndKey++) << 8; if (charSize > RemotePassword::SRP_SALT_SIZE * 2) { string msg; @@ -104,7 +103,7 @@ length -= (charSize + 2); charSize = *saltAndKey++; - charSize += ((unsigned)*saltAndKey++) << 8; + charSize += ((unsigned) *saltAndKey++) << 8; if (charSize + 2 != length) { string msg; @@ -125,7 +124,7 @@ cb->putData(data.length(), data.c_str()); } - catch(const Exception& ex) + catch (const Exception& ex) { ex.stuffException(status); return AUTH_FAILED; @@ -135,8 +134,7 @@ } -Result SrpClient::getSessionKey(Firebird::IStatus*, - const unsigned char** key, unsigned int* keyLen) +Result SrpClient::getSessionKey(IStatus*, const unsigned char** key, unsigned int* keyLen) { if (!sessionKey.hasData()) { @@ -161,13 +159,12 @@ namespace { - Firebird::SimpleFactory<SrpClient> factory; + SimpleFactory<SrpClient> factory; } -void registerSrpClient(Firebird::IPluginManager* iPlugin) +void registerSrpClient(IPluginManager* iPlugin) { iPlugin->registerPluginFactory(PluginType::AuthClient, RemotePassword::plugName, &factory); } } // namespace Auth - Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -115,24 +115,26 @@ void prepareDataStructures() { - const char* script[] = { -"CREATE TABLE PLG$SRP (PLG$USER_NAME SEC$USER_NAME NOT NULL PRIMARY KEY, " -"PLG$VERIFIER VARCHAR(128) CHARACTER SET OCTETS NOT NULL, " -"PLG$SALT VARCHAR(32) CHARACTER SET OCTETS NOT NULL, " -"PLG$COMMENT RDB$DESCRIPTION, PLG$FIRST SEC$NAME_PART, " -"PLG$MIDDLE SEC$NAME_PART, PLG$LAST SEC$NAME_PART)" , + const char* script[] = { + "CREATE TABLE PLG$SRP (PLG$USER_NAME SEC$USER_NAME NOT NULL PRIMARY KEY, " + "PLG$VERIFIER VARCHAR(128) CHARACTER SET OCTETS NOT NULL, " + "PLG$SALT VARCHAR(32) CHARACTER SET OCTETS NOT NULL, " + "PLG$COMMENT RDB$DESCRIPTION, PLG$FIRST SEC$NAME_PART, " + "PLG$MIDDLE SEC$NAME_PART, PLG$LAST SEC$NAME_PART)" + , + "CREATE VIEW PLG$SRP_VIEW AS " + "SELECT PLG$USER_NAME, PLG$VERIFIER, PLG$SALT, PLG$COMMENT, PLG$FIRST, PLG$MIDDLE, PLG$LAST " + "FROM PLG$SRP WHERE CURRENT_USER = 'SYSDBA' OR CURRENT_ROLE = 'RDB$ADMIN' OR CURRENT_USER = PLG$SRP.PLG$USER_NAME" + , + "GRANT ALL ON PLG$SRP to VIEW PLG$SRP_VIEW" + , + "GRANT SELECT ON PLG$SRP_VIEW to PUBLIC" + , + "GRANT UPDATE(PLG$VERIFIER, PLG$SALT, PLG$FIRST, PLG$MIDDLE, PLG$LAST) ON PLG$SRP_VIEW TO PUBLIC" + , + NULL + }; -"CREATE VIEW PLG$SRP_VIEW AS " -"SELECT PLG$USER_NAME, PLG$VERIFIER, PLG$SALT, PLG$COMMENT, PLG$FIRST, PLG$MIDDLE, PLG$LAST " -"FROM PLG$SRP WHERE CURRENT_USER = 'SYSDBA' OR CURRENT_ROLE = 'RDB$ADMIN' OR CURRENT_USER = PLG$SRP.PLG$USER_NAME", - -"GRANT ALL ON PLG$SRP to VIEW PLG$SRP_VIEW", - -"GRANT SELECT ON PLG$SRP_VIEW to PUBLIC", - -"GRANT UPDATE(PLG$VERIFIER, PLG$SALT, PLG$FIRST, PLG$MIDDLE, PLG$LAST) ON PLG$SRP_VIEW TO PUBLIC", - NULL }; - Firebird::LocalStatus s; Firebird::RefPtr<Firebird::ITransaction> ddlTran(att->startTransaction(&s, 0, NULL)); if (!s.isSuccess()) @@ -506,7 +508,7 @@ Firebird::status_exception::raise(status->get()); } } - catch(const Firebird::Exception&) + catch (const Firebird::Exception&) { printf("Exception\n"); if (stmt.hasData()) @@ -518,8 +520,8 @@ } break; - default: - return -1; + default: + return -1; } } catch (const Firebird::Exception& ex) @@ -527,7 +529,7 @@ ex.stuffException(status); return -1; -/* + /* switch(user->operation()) { case ADD_OPER: @@ -550,7 +552,7 @@ default: return GsecMsg17; } - */ + */ } return 0; Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -62,8 +62,7 @@ // IServer implementation Result FB_CARG authenticate(IStatus* status, IServerBlock* sBlock, IWriter* writerInterface); - Result FB_CARG getSessionKey(Firebird::IStatus* status, - const unsigned char** key, unsigned int* keyLen); + Result FB_CARG getSessionKey(IStatus* status, const unsigned char** key, unsigned int* keyLen); int FB_CARG release(); private: @@ -75,7 +74,7 @@ string salt; UCharBuffer sessionKey; RefPtr<IFirebirdConf> config; - const char *secDbName; + const char* secDbName; }; Result SrpServer::authenticate(IStatus* status, IServerBlock* sb, IWriter* writerInterface) @@ -158,25 +157,29 @@ const char* sql = "SELECT PLG$VERIFIER, PLG$SALT FROM PLG$SRP WHERE PLG$USER_NAME = ?"; stmt->prepare(status, tra, 0, sql, 3, 0); + if (!status->isSuccess()) { const ISC_STATUS* v = status->get(); + while (v[0] == isc_arg_gds) { if (v[1] == isc_dsql_relation_err) { Arg::Gds(isc_missing_data_structures).raise(); } + do { v += 2; } while (v[0] != isc_arg_warning && v[0] != isc_arg_gds && v[0] != isc_arg_end); } + status_exception::raise(status->get()); } Message par; - Field <VarChar<SZ_LOGIN> > login(par); + Field<VarChar<SZ_LOGIN> > login(par); login() = account.c_str(); login.null() = 0; HANDSHAKE_DEBUG(fprintf(stderr, "Srv SRP1: Ready to run statement with login '%s'\n", account.c_str())); @@ -283,8 +286,7 @@ return AUTH_FAILED; } -Result SrpServer::getSessionKey(Firebird::IStatus*, - const unsigned char** key, unsigned int* keyLen) +Result SrpServer::getSessionKey(IStatus*, const unsigned char** key, unsigned int* keyLen) { if (!sessionKey.hasData()) { @@ -318,4 +320,3 @@ } } // namespace Auth - Modified: firebird/trunk/src/auth/SecureRemotePassword/srp.cpp =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/srp.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecureRemotePassword/srp.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -218,4 +218,3 @@ #endif } // namespace Auth - Modified: firebird/trunk/src/auth/SecureRemotePassword/srp.h =================================================================== --- firebird/trunk/src/auth/SecureRemotePassword/srp.h 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecureRemotePassword/srp.h 2011-12-24 18:08:13 UTC (rev 53751) @@ -13,35 +13,35 @@ /* * Order of battle for SRP handshake: - * + * * 0. At account creation, the server generates - * a random salt and computes a password + * a random salt and computes a password * verifier from the account name, password, * and salt. -* +* * 1. Client generates random number * as private key, computes public * key. - * - * 2. Client sends server the account + * + * 2. Client sends server the account * name and its public key. * 3. Server receives account name, looks up * salt and password verifier. Server * generates random number as private key. * Server computes public key from private * key, account name, verifier, and salt. - * + * * 4. Server sends client public key and salt - * + * * 3. Client receives server public * key and computes session key * from server key, salt, account * name, and password. * 5. Server computes session key from client * public key, client name, and verifier - * + * * For full details, see http://www.ietf.org/rfc/rfc5054.txt - * + * */ class RemoteGroup; Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyHash.h =================================================================== --- firebird/trunk/src/auth/SecurityDatabase/LegacyHash.h 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecurityDatabase/LegacyHash.h 2011-12-24 18:08:13 UTC (rev 53751) @@ -41,7 +41,6 @@ class LegacyHash { public: - static void hash(Firebird::string& h, const Firebird::string& userName, const TEXT* passwd) { Firebird::string salt; Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp =================================================================== --- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -451,7 +451,8 @@ const static unsigned int INIT_KEY = ((~0) - 1); static unsigned int secDbKey = INIT_KEY; -Result SecurityDatabaseServer::authenticate(Firebird::IStatus* status, IServerBlock* sBlock, IWriter* writerInterface) +Result SecurityDatabaseServer::authenticate(Firebird::IStatus* status, IServerBlock* sBlock, + IWriter* writerInterface) { status->init(); @@ -512,7 +513,7 @@ } Result SecurityDatabaseServer::getSessionKey(Firebird::IStatus*, - const unsigned char** key, unsigned int* keyLen) + const unsigned char** key, unsigned int* keyLen) { *key = NULL; *keyLen = 0; Modified: firebird/trunk/src/common/classes/GetPlugins.h =================================================================== --- firebird/trunk/src/common/classes/GetPlugins.h 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/common/classes/GetPlugins.h 2011-12-24 18:08:13 UTC (rev 53751) @@ -47,8 +47,9 @@ { LocalStatus status; pluginSet = pluginInterface->getPlugins(&status, interfaceType, - namesList ? namesList : Config::getPlugins(interfaceType), - desiredVersion, ui, NULL); + (namesList ? namesList : Config::getPlugins(interfaceType)), + desiredVersion, ui, NULL); + if (!pluginSet) { fb_assert(!status.isSuccess()); @@ -66,8 +67,9 @@ { LocalStatus status; pluginSet = pluginInterface->getPlugins(&status, interfaceType, - namesList ? namesList : Config::getPlugins(interfaceType), - desiredVersion, ui, new FirebirdConf(knownConfig)); + (namesList ? namesList : Config::getPlugins(interfaceType)), + desiredVersion, ui, new FirebirdConf(knownConfig)); + if (!pluginSet) { fb_assert(!status.isSuccess()); Modified: firebird/trunk/src/common/sha.cpp =================================================================== --- firebird/trunk/src/common/sha.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/common/sha.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -345,7 +345,7 @@ namespace Firebird { - void Sha1::hashBased64(Firebird::string& hash, const Firebird::string& data) + void Sha1::hashBased64(string& hash, const string& data) { SHA_INFO si; sha_init(&si); @@ -395,4 +395,3 @@ } } // namespace Firebird - Modified: firebird/trunk/src/dsql/parse.y =================================================================== --- firebird/trunk/src/dsql/parse.y 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/dsql/parse.y 2011-12-24 18:08:13 UTC (rev 53751) @@ -5660,29 +5660,17 @@ internal_info : CURRENT_CONNECTION - { - $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_CONNECTION_ID)); - } + { $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_CONNECTION_ID)); } | CURRENT_TRANSACTION - { - $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_TRANSACTION_ID)); - } + { $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_TRANSACTION_ID)); } | GDSCODE - { - $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_GDSCODE)); - } + { $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_GDSCODE)); } | SQLCODE - { - $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_SQLCODE)); - } + { $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_SQLCODE)); } | SQLSTATE - { - $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_SQLSTATE)); - } + { $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_SQLSTATE)); } | ROW_COUNT - { - $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_ROWS_AFFECTED)); - } + { $$ = newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_ROWS_AFFECTED)); } ; sql_string Modified: firebird/trunk/src/include/firebird/Provider.h =================================================================== --- firebird/trunk/src/include/firebird/Provider.h 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/include/firebird/Provider.h 2011-12-24 18:08:13 UTC (rev 53751) @@ -115,7 +115,7 @@ { public: // Prepare flags. - static const unsigned PREPARE_PREFETCH_NONE = 0x0; + static const unsigned PREPARE_PREFETCH_NONE = 0x00; static const unsigned PREPARE_PREFETCH_TYPE = 0x01; static const unsigned PREPARE_PREFETCH_INPUT_PARAMETERS = 0x02; static const unsigned PREPARE_PREFETCH_OUTPUT_PARAMETERS = 0x04; Modified: firebird/trunk/src/lock/lock.cpp =================================================================== --- firebird/trunk/src/lock/lock.cpp 2011-12-24 17:59:53 UTC (rev 53750) +++ firebird/trunk/src/lock/lock.cpp 2011-12-24 18:08:13 UTC (rev 53751) @@ -3581,7 +3581,6 @@ CHECK(found == 1); // request is in lock's queue } - if (freed == EXPECT_inuse) { CHECK(found_pending == lock->lbl_pending_lrq_count); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-12-25 03:19:30
|
Revision: 53753 http://firebird.svn.sourceforge.net/firebird/?rev=53753&view=rev Author: firebirds Date: 2011-12-25 03:19:23 +0000 (Sun, 25 Dec 2011) 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 2011-12-24 18:21:57 UTC (rev 53752) +++ firebird/trunk/ChangeLog 2011-12-25 03:19:23 UTC (rev 53753) @@ -1,3 +1,24 @@ + 2011-12-24 18:08 asfernandes + M builds/posix/Makefile.in + M doc/sql.extensions/README.builtin_functions.txt + M src/auth/SecureRemotePassword/client/SrpClient.cpp + M src/auth/SecureRemotePassword/manage/SrpManagement.cpp + M src/auth/SecureRemotePassword/server/SrpServer.cpp + M src/auth/SecureRemotePassword/srp.cpp + M src/auth/SecureRemotePassword/srp.h + M src/auth/SecurityDatabase/LegacyHash.h + M src/auth/SecurityDatabase/LegacyServer.cpp + M src/common/classes/GetPlugins.h + M src/common/sha.cpp + M src/dsql/parse.y + M src/include/firebird/Provider.h + M src/lock/lock.cpp +Misc. + + 2011-12-24 17:59 asfernandes + M src/include/firebird/Plugin.h +Correction. + 2011-12-23 18:33 dimitr M src/remote/client/interface.cpp M src/remote/inet.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-24 18:21:57 UTC (rev 53752) +++ firebird/trunk/src/jrd/build_no.h 2011-12-25 03:19:23 UTC (rev 53753) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29661 + FORMAL BUILD NUMBER:29663 */ -#define PRODUCT_VER_STRING "3.0.0.29661" -#define FILE_VER_STRING "WI-T3.0.0.29661" -#define LICENSE_VER_STRING "WI-T3.0.0.29661" -#define FILE_VER_NUMBER 3, 0, 0, 29661 +#define PRODUCT_VER_STRING "3.0.0.29663" +#define FILE_VER_STRING "WI-T3.0.0.29663" +#define LICENSE_VER_STRING "WI-T3.0.0.29663" +#define FILE_VER_NUMBER 3, 0, 0, 29663 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29661" +#define FB_BUILD_NO "29663" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-24 18:21:57 UTC (rev 53752) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-25 03:19:23 UTC (rev 53753) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29661 +BuildNum=29663 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...> - 2011-12-27 03:21:38
|
Revision: 53774 http://firebird.svn.sourceforge.net/firebird/?rev=53774&view=rev Author: firebirds Date: 2011-12-27 03:21:31 +0000 (Tue, 27 Dec 2011) 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 2011-12-26 23:35:48 UTC (rev 53773) +++ firebird/trunk/ChangeLog 2011-12-27 03:21:31 UTC (rev 53774) @@ -1,3 +1,242 @@ + 2011-12-26 23:35 hvlad + M builds/win32/msvc10/Firebird3.sln + M builds/win32/msvc10/common.vcxproj + M builds/win32/msvc10/common.vcxproj.filters + M builds/win32/msvc10/fbserver.vcxproj + M builds/win32/msvc10/fbserver.vcxproj.filters + M builds/win32/msvc10/firebird2.props + M builds/win32/msvc10/remote.vcxproj + M builds/win32/msvc10/remote.vcxproj.filters + A builds/win32/msvc10/srp.filters + A builds/win32/msvc10/srp.vcxproj + M builds/win32/msvc10/yvalve.vcxproj + M builds/win32/msvc10/yvalve.vcxproj.filters +Update VS 2010 build to support SRP. +New plugin srp.dll is created - it is necessary for user management using SRP. +VC8\VC9 builds will follow tomorrow. + + 2011-12-26 23:20 hvlad + M builds/win32/make_boot.bat +Build LibTomMath as part of boot build process. Only VS2010 supported so far. + + 2011-12-26 23:18 hvlad + M extern/libtommath + M extern/libtommath/libtommath_VS2010.vcxproj +Clean up project file and make working folders ignored by SVN + + 2011-12-26 22:37 hvlad + A extern/libtommath/libtommath_VS2010.sln + A extern/libtommath/libtommath_VS2010.vcxproj +VS2010 project files + + 2011-12-26 22:29 hvlad + A extern/libtommath + A extern/libtommath/LICENSE + A extern/libtommath/bn_error.c + A extern/libtommath/bn_fast_mp_invmod.c + A extern/libtommath/bn_fast_mp_montgomery_reduce.c + A extern/libtommath/bn_fast_s_mp_mul_digs.c + A extern/libtommath/bn_fast_s_mp_mul_high_digs.c + A extern/libtommath/bn_fast_s_mp_sqr.c + A extern/libtommath/bn_mp_2expt.c + A extern/libtommath/bn_mp_abs.c + A extern/libtommath/bn_mp_add.c + A extern/libtommath/bn_mp_add_d.c + A extern/libtommath/bn_mp_addmod.c + A extern/libtommath/bn_mp_and.c + A extern/libtommath/bn_mp_clamp.c + A extern/libtommath/bn_mp_clear.c + A extern/libtommath/bn_mp_clear_multi.c + A extern/libtommath/bn_mp_cmp.c + A extern/libtommath/bn_mp_cmp_d.c + A extern/libtommath/bn_mp_cmp_mag.c + A extern/libtommath/bn_mp_cnt_lsb.c + A extern/libtommath/bn_mp_copy.c + A extern/libtommath/bn_mp_count_bits.c + A extern/libtommath/bn_mp_div.c + A extern/libtommath/bn_mp_div_2.c + A extern/libtommath/bn_mp_div_2d.c + A extern/libtommath/bn_mp_div_3.c + A extern/libtommath/bn_mp_div_d.c + A extern/libtommath/bn_mp_dr_is_modulus.c + A extern/libtommath/bn_mp_dr_reduce.c + A extern/libtommath/bn_mp_dr_setup.c + A extern/libtommath/bn_mp_exch.c + A extern/libtommath/bn_mp_expt_d.c + A extern/libtommath/bn_mp_exptmod.c + A extern/libtommath/bn_mp_exptmod_fast.c + A extern/libtommath/bn_mp_exteuclid.c + A extern/libtommath/bn_mp_fread.c + A extern/libtommath/bn_mp_fwrite.c + A extern/libtommath/bn_mp_gcd.c + A extern/libtommath/bn_mp_get_int.c + A extern/libtommath/bn_mp_grow.c + A extern/libtommath/bn_mp_init.c + A extern/libtommath/bn_mp_init_copy.c + A extern/libtommath/bn_mp_init_multi.c + A extern/libtommath/bn_mp_init_set.c + A extern/libtommath/bn_mp_init_set_int.c + A extern/libtommath/bn_mp_init_size.c + A extern/libtommath/bn_mp_invmod.c + A extern/libtommath/bn_mp_invmod_slow.c + A extern/libtommath/bn_mp_is_square.c + A extern/libtommath/bn_mp_jacobi.c + A extern/libtommath/bn_mp_karatsuba_mul.c + A extern/libtommath/bn_mp_karatsuba_sqr.c + A extern/libtommath/bn_mp_lcm.c + A extern/libtommath/bn_mp_lshd.c + A extern/libtommath/bn_mp_mod.c + A extern/libtommath/bn_mp_mod_2d.c + A extern/libtommath/bn_mp_mod_d.c + A extern/libtommath/bn_mp_montgomery_calc_normalization.c + A extern/libtommath/bn_mp_montgomery_reduce.c + A extern/libtommath/bn_mp_montgomery_setup.c + A extern/libtommath/bn_mp_mul.c + A extern/libtommath/bn_mp_mul_2.c + A extern/libtommath/bn_mp_mul_2d.c + A extern/libtommath/bn_mp_mul_d.c + A extern/libtommath/bn_mp_mulmod.c + A extern/libtommath/bn_mp_n_root.c + A extern/libtommath/bn_mp_neg.c + A extern/libtommath/bn_mp_or.c + A extern/libtommath/bn_mp_prime_fermat.c + A extern/libtommath/bn_mp_prime_is_divisible.c + A extern/libtommath/bn_mp_prime_is_prime.c + A extern/libtommath/bn_mp_prime_miller_rabin.c + A extern/libtommath/bn_mp_prime_next_prime.c + A extern/libtommath/bn_mp_prime_rabin_miller_trials.c + A extern/libtommath/bn_mp_prime_random_ex.c + A extern/libtommath/bn_mp_radix_size.c + A extern/libtommath/bn_mp_radix_smap.c + A extern/libtommath/bn_mp_rand.c + A extern/libtommath/bn_mp_read_radix.c + A extern/libtommath/bn_mp_read_signed_bin.c + A extern/libtommath/bn_mp_read_unsigned_bin.c + A extern/libtommath/bn_mp_reduce.c + A extern/libtommath/bn_mp_reduce_2k.c + A extern/libtommath/bn_mp_reduce_2k_l.c + A extern/libtommath/bn_mp_reduce_2k_setup.c + A extern/libtommath/bn_mp_reduce_2k_setup_l.c + A extern/libtommath/bn_mp_reduce_is_2k.c + A extern/libtommath/bn_mp_reduce_is_2k_l.c + A extern/libtommath/bn_mp_reduce_setup.c + A extern/libtommath/bn_mp_rshd.c + A extern/libtommath/bn_mp_set.c + A extern/libtommath/bn_mp_set_int.c + A extern/libtommath/bn_mp_shrink.c + A extern/libtommath/bn_mp_signed_bin_size.c + A extern/libtommath/bn_mp_sqr.c + A extern/libtommath/bn_mp_sqrmod.c + A extern/libtommath/bn_mp_sqrt.c + A extern/libtommath/bn_mp_sub.c + A extern/libtommath/bn_mp_sub_d.c + A extern/libtommath/bn_mp_submod.c + A extern/libtommath/bn_mp_to_signed_bin.c + A extern/libtommath/bn_mp_to_signed_bin_n.c + A extern/libtommath/bn_mp_to_unsigned_bin.c + A extern/libtommath/bn_mp_to_unsigned_bin_n.c + A extern/libtommath/bn_mp_toom_mul.c + A extern/libtommath/bn_mp_toom_sqr.c + A extern/libtommath/bn_mp_toradix.c + A extern/libtommath/bn_mp_toradix_n.c + A extern/libtommath/bn_mp_unsigned_bin_size.c + A extern/libtommath/bn_mp_xor.c + A extern/libtommath/bn_mp_zero.c + A extern/libtommath/bn_prime_tab.c + A extern/libtommath/bn_reverse.c + A extern/libtommath/bn_s_mp_add.c + A extern/libtommath/bn_s_mp_exptmod.c + A extern/libtommath/bn_s_mp_mul_digs.c + A extern/libtommath/bn_s_mp_mul_high_digs.c + A extern/libtommath/bn_s_mp_sqr.c + A extern/libtommath/bn_s_mp_sub.c + A extern/libtommath/bncore.c + A extern/libtommath/libtommath.dsp + A extern/libtommath/libtommath_VS2005.sln + A extern/libtommath/libtommath_VS2005.vcproj + A extern/libtommath/libtommath_VS2008.sln + A extern/libtommath/libtommath_VS2008.vcproj + A extern/libtommath/makefile + A extern/libtommath/makefile.bcc + A extern/libtommath/makefile.cygwin_dll + A extern/libtommath/makefile.icc + A extern/libtommath/makefile.msvc + A extern/libtommath/makefile.shared + A extern/libtommath/mess.sh + A extern/libtommath/pretty.build + A extern/libtommath/tommath.h + A extern/libtommath/tommath_class.h + A extern/libtommath/tommath_superclass.h +Import LibTomMath library required for SRP to work. +This is minimal subset of source code. + + 2011-12-26 16:06 alexpeshkoff + M src/auth/SecureRemotePassword/manage/SrpManagement.cpp + M src/common/security.cpp + M src/common/security.h + M src/jrd/UserManagement.cpp + M src/jrd/UserManagement.h + M src/remote/server/server.cpp + M src/utilities/gsec/gsec.cpp +Diagnostics + + 2011-12-26 14:51 alexpeshkoff + M src/utilities/gsec/gsec.cpp +Enable passwords >9 bytes in gsec. Remove old warning. + + 2011-12-26 14:46 hvlad + M src/remote/server/os/win32/srvr_w32.cpp +Built SRP server into firebird.exe + + 2011-12-26 14:33 alexpeshkoff + M src/auth/SecureRemotePassword/srp.cpp +Fixed init/fini order in srp + + 2011-12-26 13:51 dimitr + M src/remote/client/interface.cpp + M src/remote/remote.h +A patch resolving client-side crashes with a new fbclient. Thanks to Alex. + + 2011-12-26 13:35 hvlad + M src/common/BigInteger.cpp +Fixed mismatched parameters order + + 2011-12-26 13:17 dimitr + M src/remote/os/win32/wnet.cpp +Fixed the asserts in the debug build. + + 2011-12-26 12:57 dimitr + M src/remote/server/server.cpp +Fixed a connection error (FB3 client - FB3 server), only LegacyAuth was affected. + + 2011-12-26 12:41 alexpeshkoff + M builds/install/misc/firebird.conf.in +correct defaults + + 2011-12-26 12:26 dimitr + M src/auth/trusted/AuthSspi.cpp + M src/auth/trusted/AuthSspi.h +This should fix the trusted authentication. + + 2011-12-26 10:05 alexpeshkoff + M src/include/firebird/Plugin.h + M src/yvalve/PluginManager.cpp +Fixed overloaded virtual function error - thanks to Adriano + + 2011-12-26 09:16 alexpeshkoff + D src/auth/SecureRemotePassword/BigInteger.cpp + D src/auth/SecureRemotePassword/BigInteger.h + M src/auth/SecureRemotePassword/manage/SrpManagement.cpp + M src/auth/SecureRemotePassword/srp.cpp + M src/auth/SecureRemotePassword/srp.h + A src/common/BigInteger.cpp (from /firebird/trunk/src/auth/SecureRemotePassword/BigInteger.cpp:53739) + A src/common/BigInteger.h (from /firebird/trunk/src/auth/SecureRemotePassword/BigInteger.h:53739) +Moved big integer implementation to common dir + + 2011-12-26 08:50 dimitr + M src/auth/SecureRemotePassword/server/SrpServer.cpp +Correction. + 2011-12-24 18:08 asfernandes M builds/posix/Makefile.in M doc/sql.extensions/README.builtin_functions.txt Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-26 23:35:48 UTC (rev 53773) +++ firebird/trunk/src/jrd/build_no.h 2011-12-27 03:21:31 UTC (rev 53774) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29663 + FORMAL BUILD NUMBER:29681 */ -#define PRODUCT_VER_STRING "3.0.0.29663" -#define FILE_VER_STRING "WI-T3.0.0.29663" -#define LICENSE_VER_STRING "WI-T3.0.0.29663" -#define FILE_VER_NUMBER 3, 0, 0, 29663 +#define PRODUCT_VER_STRING "3.0.0.29681" +#define FILE_VER_STRING "WI-T3.0.0.29681" +#define LICENSE_VER_STRING "WI-T3.0.0.29681" +#define FILE_VER_NUMBER 3, 0, 0, 29681 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29663" +#define FB_BUILD_NO "29681" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-26 23:35:48 UTC (rev 53773) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-27 03:21:31 UTC (rev 53774) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29663 +BuildNum=29681 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...> - 2011-12-28 03:21:19
|
Revision: 53780 http://firebird.svn.sourceforge.net/firebird/?rev=53780&view=rev Author: firebirds Date: 2011-12-28 03:21:12 +0000 (Wed, 28 Dec 2011) 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 2011-12-28 01:20:11 UTC (rev 53779) +++ firebird/trunk/ChangeLog 2011-12-28 03:21:12 UTC (rev 53780) @@ -1,3 +1,40 @@ + 2011-12-28 01:20 asfernandes + M src/dsql/ExprNodes.cpp + M src/dsql/ExprNodes.h +Warning. + + 2011-12-28 01:07 asfernandes + M src/remote/client/interface.cpp + M src/remote/protocol.cpp + M src/remote/remote.h + M src/remote/server/server.cpp +Misc. + + 2011-12-27 08:14 alexpeshkoff + M builds/posix/Makefile.in + M builds/posix/Makefile.in.examples + M builds/posix/darwin.defaults + M builds/posix/make.defaults + M builds/posix/make.platform.solaris.examples + M builds/posix/prefix.aix_powerpc + M builds/posix/prefix.aix_powerpc_xlc + M builds/posix/prefix.darwin_i386 + M builds/posix/prefix.darwin_powerpc + M builds/posix/prefix.darwin_ppc64 + M builds/posix/prefix.darwin_x86_64 + M builds/posix/prefix.freebsd + M builds/posix/prefix.freebsd_amd64 + M builds/posix/prefix.hpux + M builds/posix/prefix.hpux_aCC + M builds/posix/prefix.hpux_ia64 + M builds/posix/prefix.mingw + M builds/posix/prefix.netbsd + M builds/posix/prefix.solaris + M builds/posix/prefix.solaris-64gcc + M builds/posix/prefix.solx86gcc + M builds/posix/prefix.solx86gcc_64 +Fixed CORE-3677: Stop utilities to export entrypoints + 2011-12-26 23:35 hvlad M builds/win32/msvc10/Firebird3.sln M builds/win32/msvc10/common.vcxproj Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-28 01:20:11 UTC (rev 53779) +++ firebird/trunk/src/jrd/build_no.h 2011-12-28 03:21:12 UTC (rev 53780) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29681 + FORMAL BUILD NUMBER:29684 */ -#define PRODUCT_VER_STRING "3.0.0.29681" -#define FILE_VER_STRING "WI-T3.0.0.29681" -#define LICENSE_VER_STRING "WI-T3.0.0.29681" -#define FILE_VER_NUMBER 3, 0, 0, 29681 +#define PRODUCT_VER_STRING "3.0.0.29684" +#define FILE_VER_STRING "WI-T3.0.0.29684" +#define LICENSE_VER_STRING "WI-T3.0.0.29684" +#define FILE_VER_NUMBER 3, 0, 0, 29684 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29681" +#define FB_BUILD_NO "29684" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-28 01:20:11 UTC (rev 53779) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-28 03:21:12 UTC (rev 53780) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29681 +BuildNum=29684 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2011-12-28 15:15:40
|
Revision: 53785 http://firebird.svn.sourceforge.net/firebird/?rev=53785&view=rev Author: hvlad Date: 2011-12-28 15:15:32 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Adjust LibTomMath project files to allow build both Firebird and libtommath library by the same version of MSVC. Adjust make_boot to automatically choose correct solution to build libtommath. Modified Paths: -------------- firebird/trunk/builds/win32/make_boot.bat Added Paths: ----------- firebird/trunk/extern/libtommath/libtommath_MSVC10.sln firebird/trunk/extern/libtommath/libtommath_MSVC10.vcxproj firebird/trunk/extern/libtommath/libtommath_MSVC8.sln firebird/trunk/extern/libtommath/libtommath_MSVC8.vcproj firebird/trunk/extern/libtommath/libtommath_MSVC9.sln firebird/trunk/extern/libtommath/libtommath_MSVC9.vcproj Removed Paths: ------------- firebird/trunk/extern/libtommath/libtommath_VS2005.sln firebird/trunk/extern/libtommath/libtommath_VS2005.vcproj firebird/trunk/extern/libtommath/libtommath_VS2008.sln firebird/trunk/extern/libtommath/libtommath_VS2008.vcproj firebird/trunk/extern/libtommath/libtommath_VS2010.sln firebird/trunk/extern/libtommath/libtommath_VS2010.vcxproj Modified: firebird/trunk/builds/win32/make_boot.bat =================================================================== --- firebird/trunk/builds/win32/make_boot.bat 2011-12-28 14:31:39 UTC (rev 53784) +++ firebird/trunk/builds/win32/make_boot.bat 2011-12-28 15:15:32 UTC (rev 53785) @@ -108,8 +108,8 @@ :: BUILD LibTomMath :LibTomMath @echo. -@echo Building LibTomMath ... -@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_VS2010 libtommath_%FB_TARGET_PLATFORM%.log libtommath +@echo Building LibTomMath (%FB_OBJ_DIR%)... +@call compile.bat %FB_ROOT_PATH%\extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_TARGET_PLATFORM%.log libtommath if errorlevel 1 call :boot2 LibTomMath goto :EOF Copied: firebird/trunk/extern/libtommath/libtommath_MSVC10.sln (from rev 53770, firebird/trunk/extern/libtommath/libtommath_VS2010.sln) =================================================================== --- firebird/trunk/extern/libtommath/libtommath_MSVC10.sln (rev 0) +++ firebird/trunk/extern/libtommath/libtommath_MSVC10.sln 2011-12-28 15:15:32 UTC (rev 53785) @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtommath", "libtommath_MSVC10.vcproj", "{42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Debug|Win32.ActiveCfg = Debug|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Debug|Win32.Build.0 = Debug|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Debug|x64.ActiveCfg = Debug|x64 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Debug|x64.Build.0 = Debug|x64 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Release|Win32.ActiveCfg = Release|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Release|Win32.Build.0 = Release|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Release|x64.ActiveCfg = Release|x64 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Copied: firebird/trunk/extern/libtommath/libtommath_MSVC10.vcxproj (from rev 53771, firebird/trunk/extern/libtommath/libtommath_VS2010.vcxproj) =================================================================== --- firebird/trunk/extern/libtommath/libtommath_MSVC10.vcxproj (rev 0) +++ firebird/trunk/extern/libtommath/libtommath_MSVC10.vcxproj 2011-12-28 15:15:32 UTC (rev 53785) @@ -0,0 +1,360 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>libtommath</ProjectName> + <ProjectGuid>{42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}</ProjectGuid> + <RootNamespace>libtommath</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win64|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win64|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">temp\$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">temp\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">temp\$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">temp\$(Platform)\$(Configuration)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">tommath</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">tommath</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">tommath</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">tommath</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> + <ObjectFileName>$(IntDir)</ObjectFileName> + <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(OutDir)\$(TargetFileName)</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug/libtommath.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> + <ObjectFileName>$(IntDir)</ObjectFileName> + <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(OutDir)\$(TargetFileName)</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Debug/libtommath.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> + <ObjectFileName>$(IntDir)</ObjectFileName> + <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(OutDir)\$(TargetFileName)</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release/libtommath.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> + <ObjectFileName>$(IntDir)</ObjectFileName> + <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(OutDir)\$(TargetFileName)</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <SuppressStartupBanner>true</SuppressStartupBanner> + <OutputFile>.\Release/libtommath.bsc</OutputFile> + </Bscmake> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="bn_error.c" /> + <ClCompile Include="bn_fast_mp_invmod.c" /> + <ClCompile Include="bn_fast_mp_montgomery_reduce.c" /> + <ClCompile Include="bn_fast_s_mp_mul_digs.c" /> + <ClCompile Include="bn_fast_s_mp_mul_high_digs.c" /> + <ClCompile Include="bn_fast_s_mp_sqr.c" /> + <ClCompile Include="bn_mp_2expt.c" /> + <ClCompile Include="bn_mp_abs.c" /> + <ClCompile Include="bn_mp_add.c" /> + <ClCompile Include="bn_mp_add_d.c" /> + <ClCompile Include="bn_mp_addmod.c" /> + <ClCompile Include="bn_mp_and.c" /> + <ClCompile Include="bn_mp_clamp.c" /> + <ClCompile Include="bn_mp_clear.c" /> + <ClCompile Include="bn_mp_clear_multi.c" /> + <ClCompile Include="bn_mp_cmp.c" /> + <ClCompile Include="bn_mp_cmp_d.c" /> + <ClCompile Include="bn_mp_cmp_mag.c" /> + <ClCompile Include="bn_mp_cnt_lsb.c" /> + <ClCompile Include="bn_mp_copy.c" /> + <ClCompile Include="bn_mp_count_bits.c" /> + <ClCompile Include="bn_mp_div.c" /> + <ClCompile Include="bn_mp_div_2.c" /> + <ClCompile Include="bn_mp_div_2d.c" /> + <ClCompile Include="bn_mp_div_3.c" /> + <ClCompile Include="bn_mp_div_d.c" /> + <ClCompile Include="bn_mp_dr_is_modulus.c" /> + <ClCompile Include="bn_mp_dr_reduce.c" /> + <ClCompile Include="bn_mp_dr_setup.c" /> + <ClCompile Include="bn_mp_exch.c" /> + <ClCompile Include="bn_mp_expt_d.c" /> + <ClCompile Include="bn_mp_exptmod.c" /> + <ClCompile Include="bn_mp_exptmod_fast.c" /> + <ClCompile Include="bn_mp_exteuclid.c" /> + <ClCompile Include="bn_mp_fread.c" /> + <ClCompile Include="bn_mp_fwrite.c" /> + <ClCompile Include="bn_mp_gcd.c" /> + <ClCompile Include="bn_mp_get_int.c" /> + <ClCompile Include="bn_mp_grow.c" /> + <ClCompile Include="bn_mp_init.c" /> + <ClCompile Include="bn_mp_init_copy.c" /> + <ClCompile Include="bn_mp_init_multi.c" /> + <ClCompile Include="bn_mp_init_set.c" /> + <ClCompile Include="bn_mp_init_set_int.c" /> + <ClCompile Include="bn_mp_init_size.c" /> + <ClCompile Include="bn_mp_invmod.c" /> + <ClCompile Include="bn_mp_invmod_slow.c" /> + <ClCompile Include="bn_mp_is_square.c" /> + <ClCompile Include="bn_mp_jacobi.c" /> + <ClCompile Include="bn_mp_karatsuba_mul.c" /> + <ClCompile Include="bn_mp_karatsuba_sqr.c" /> + <ClCompile Include="bn_mp_lcm.c" /> + <ClCompile Include="bn_mp_lshd.c" /> + <ClCompile Include="bn_mp_mod.c" /> + <ClCompile Include="bn_mp_mod_2d.c" /> + <ClCompile Include="bn_mp_mod_d.c" /> + <ClCompile Include="bn_mp_montgomery_calc_normalization.c" /> + <ClCompile Include="bn_mp_montgomery_reduce.c" /> + <ClCompile Include="bn_mp_montgomery_setup.c" /> + <ClCompile Include="bn_mp_mul.c" /> + <ClCompile Include="bn_mp_mul_2.c" /> + <ClCompile Include="bn_mp_mul_2d.c" /> + <ClCompile Include="bn_mp_mul_d.c" /> + <ClCompile Include="bn_mp_mulmod.c" /> + <ClCompile Include="bn_mp_n_root.c" /> + <ClCompile Include="bn_mp_neg.c" /> + <ClCompile Include="bn_mp_or.c" /> + <ClCompile Include="bn_mp_prime_fermat.c" /> + <ClCompile Include="bn_mp_prime_is_divisible.c" /> + <ClCompile Include="bn_mp_prime_is_prime.c" /> + <ClCompile Include="bn_mp_prime_miller_rabin.c" /> + <ClCompile Include="bn_mp_prime_next_prime.c" /> + <ClCompile Include="bn_mp_prime_rabin_miller_trials.c" /> + <ClCompile Include="bn_mp_prime_random_ex.c" /> + <ClCompile Include="bn_mp_radix_size.c" /> + <ClCompile Include="bn_mp_radix_smap.c" /> + <ClCompile Include="bn_mp_rand.c" /> + <ClCompile Include="bn_mp_read_radix.c" /> + <ClCompile Include="bn_mp_read_signed_bin.c" /> + <ClCompile Include="bn_mp_read_unsigned_bin.c" /> + <ClCompile Include="bn_mp_reduce.c" /> + <ClCompile Include="bn_mp_reduce_2k.c" /> + <ClCompile Include="bn_mp_reduce_2k_l.c" /> + <ClCompile Include="bn_mp_reduce_2k_setup.c" /> + <ClCompile Include="bn_mp_reduce_2k_setup_l.c" /> + <ClCompile Include="bn_mp_reduce_is_2k.c" /> + <ClCompile Include="bn_mp_reduce_is_2k_l.c" /> + <ClCompile Include="bn_mp_reduce_setup.c" /> + <ClCompile Include="bn_mp_rshd.c" /> + <ClCompile Include="bn_mp_set.c" /> + <ClCompile Include="bn_mp_set_int.c" /> + <ClCompile Include="bn_mp_shrink.c" /> + <ClCompile Include="bn_mp_signed_bin_size.c" /> + <ClCompile Include="bn_mp_sqr.c" /> + <ClCompile Include="bn_mp_sqrmod.c" /> + <ClCompile Include="bn_mp_sqrt.c" /> + <ClCompile Include="bn_mp_sub.c" /> + <ClCompile Include="bn_mp_sub_d.c" /> + <ClCompile Include="bn_mp_submod.c" /> + <ClCompile Include="bn_mp_to_signed_bin.c" /> + <ClCompile Include="bn_mp_to_signed_bin_n.c" /> + <ClCompile Include="bn_mp_to_unsigned_bin.c" /> + <ClCompile Include="bn_mp_to_unsigned_bin_n.c" /> + <ClCompile Include="bn_mp_toom_mul.c" /> + <ClCompile Include="bn_mp_toom_sqr.c" /> + <ClCompile Include="bn_mp_toradix.c" /> + <ClCompile Include="bn_mp_toradix_n.c" /> + <ClCompile Include="bn_mp_unsigned_bin_size.c" /> + <ClCompile Include="bn_mp_xor.c" /> + <ClCompile Include="bn_mp_zero.c" /> + <ClCompile Include="bn_prime_tab.c" /> + <ClCompile Include="bn_reverse.c" /> + <ClCompile Include="bn_s_mp_add.c" /> + <ClCompile Include="bn_s_mp_exptmod.c" /> + <ClCompile Include="bn_s_mp_mul_digs.c" /> + <ClCompile Include="bn_s_mp_mul_high_digs.c" /> + <ClCompile Include="bn_s_mp_sqr.c" /> + <ClCompile Include="bn_s_mp_sub.c" /> + <ClCompile Include="bncore.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="tommath.h" /> + <ClInclude Include="tommath_class.h" /> + <ClInclude Include="tommath_superclass.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Copied: firebird/trunk/extern/libtommath/libtommath_MSVC8.sln (from rev 53783, firebird/trunk/extern/libtommath/libtommath_VS2005.sln) =================================================================== --- firebird/trunk/extern/libtommath/libtommath_MSVC8.sln (rev 0) +++ firebird/trunk/extern/libtommath/libtommath_MSVC8.sln 2011-12-28 15:15:32 UTC (rev 53785) @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtommath", "libtommath_MSVC8.vcproj", "{0272C9B2-D68B-4F24-B32D-C1FD552F7E51}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Debug|Win32.ActiveCfg = Debug|Win32 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Debug|Win32.Build.0 = Debug|Win32 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Debug|x64.ActiveCfg = Debug|x64 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Debug|x64.Build.0 = Debug|x64 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Release|Win32.ActiveCfg = Release|Win32 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Release|Win32.Build.0 = Release|Win32 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Release|x64.ActiveCfg = Release|x64 + {0272C9B2-D68B-4F24-B32D-C1FD552F7E51}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Copied: firebird/trunk/extern/libtommath/libtommath_MSVC8.vcproj (from rev 53783, firebird/trunk/extern/libtommath/libtommath_VS2005.vcproj) =================================================================== --- firebird/trunk/extern/libtommath/libtommath_MSVC8.vcproj (rev 0) +++ firebird/trunk/extern/libtommath/libtommath_MSVC8.vcproj 2011-12-28 15:15:32 UTC (rev 53785) @@ -0,0 +1,817 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libtommath" + ProjectGUID="{0272C9B2-D68B-4F24-B32D-C1FD552F7E51}" + RootNamespace="libtommath" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="lib\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="temp\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\tommath.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)\$(TargetName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="lib\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="temp\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\tommath.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)\$(TargetName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="lib\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="temp\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\tommath.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)\$(TargetName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="lib\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="temp\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\tommath.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(IntDir)\$(TargetName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\bn_error.c" + > + </File> + <File + RelativePath=".\bn_fast_mp_invmod.c" + > + </File> + <File + RelativePath=".\bn_fast_mp_montgomery_reduce.c" + > + </File> + <File + RelativePath=".\bn_fast_s_mp_mul_digs.c" + > + </File> + <File + RelativePath=".\bn_fast_s_mp_mul_high_digs.c" + > + </File> + <File + RelativePath=".\bn_fast_s_mp_sqr.c" + > + </File> + <File + RelativePath=".\bn_mp_2expt.c" + > + </File> + <File + RelativePath=".\bn_mp_abs.c" + > + </File> + <File + RelativePath=".\bn_mp_add.c" + > + </File> + <File + RelativePath=".\bn_mp_add_d.c" + > + </File> + <File + RelativePath=".\bn_mp_addmod.c" + > + </File> + <File + RelativePath=".\bn_mp_and.c" + > + </File> + <File + RelativePath=".\bn_mp_clamp.c" + > + </File> + <File + RelativePath=".\bn_mp_clear.c" + > + </File> + <File + RelativePath=".\bn_mp_clear_multi.c" + > + </File> + <File + RelativePath=".\bn_mp_cmp.c" + > + </File> + <File + RelativePath=".\bn_mp_cmp_d.c" + > + </File> + <File + RelativePath=".\bn_mp_cmp_mag.c" + > + </File> + <File + RelativePath=".\bn_mp_cnt_lsb.c" + > + </File> + <File + RelativePath=".\bn_mp_copy.c" + > + </File> + <File + RelativePath=".\bn_mp_count_bits.c" + > + </File> + <File + RelativePath=".\bn_mp_div.c" + > + </File> + <File + RelativePath=".\bn_mp_div_2.c" + > + </File> + <File + RelativePath=".\bn_mp_div_2d.c" + > + </File> + <File + RelativePath=".\bn_mp_div_3.c" + > + </File> + <File + RelativePath=".\bn_mp_div_d.c" + > + </File> + <File + RelativePath=".\bn_mp_dr_is_modulus.c" + > + </File> + <File + RelativePath=".\bn_mp_dr_reduce.c" + > + </File> + <File + RelativePath=".\bn_mp_dr_setup.c" + > + </File> + <File + RelativePath=".\bn_mp_exch.c" + > + </File> + <File + RelativePath=".\bn_mp_expt_d.c" + > + </File> + <File + RelativePath=".\bn_mp_exptmod.c" + > + </File> + <File + RelativePath=".\bn_mp_exptmod_fast.c" + > + </File> + <File + RelativePath=".\bn_mp_exteuclid.c" + > + </File> + <File + RelativePath=".\bn_mp_fread.c" + > + </File> + <File + RelativePath=".\bn_mp_fwrite.c" + > + </File> + <File + RelativePath=".\bn_mp_gcd.c" + > + </File> + <File + RelativePath=".\bn_mp_get_int.c" + > + </File> + <File + RelativePath=".\bn_mp_grow.c" + > + </File> + <File + RelativePath=".\bn_mp_init.c" + > + </File> + <File + RelativePath=".\bn_mp_init_copy.c" + > + </File> + <File + RelativePath=".\bn_mp_init_multi.c" + > + </File> + <File + RelativePath=".\bn_mp_init_set.c" + > + </File> + <File + RelativePath=".\bn_mp_init_set_int.c" + > + </File> + <File + RelativePath=".\bn_mp_init_size.c" + > + </File> + <File + RelativePath=".\bn_mp_invmod.c" + > + </File> + <File + RelativePath=".\bn_mp_invmod_slow.c" + > + </File> + <File + RelativePath=".\bn_mp_is_square.c" + > + </File> + <File + RelativePath=".\bn_mp_jacobi.c" + > + </File> + <File + RelativePath=".\bn_mp_karatsuba_mul.c" + > + </File> + <File + RelativePath=".\bn_mp_karatsuba_sqr.c" + > + </File> + <File + RelativePath=".\bn_mp_lcm.c" + > + </File> + <File + RelativePath=".\bn_mp_lshd.c" + > + </File> + <File + RelativePath=".\bn_mp_mod.c" + > + </File> + <File + RelativePath=".\bn_mp_mod_2d.c" + > + </File> + <File + RelativePath=".\bn_mp_mod_d.c" + > + </File> + <File + RelativePath=".\bn_mp_montgomery_calc_normalization.c" + > + </File> + <File + RelativePath=".\bn_mp_montgomery_reduce.c" + > + </File> + <File + RelativePath=".\bn_mp_montgomery_setup.c" + > + </File> + <File + RelativePath=".\bn_mp_mul.c" + > + </File> + <File + RelativePath=".\bn_mp_mul_2.c" + > + </File> + <File + RelativePath=".\bn_mp_mul_2d.c" + > + </File> + <File + RelativePath=".\bn_mp_mul_d.c" + > + </File> + <File + RelativePath=".\bn_mp_mulmod.c" + > + </File> + <File + RelativePath=".\bn_mp_n_root.c" + > + </File> + <File + RelativePath=".\bn_mp_neg.c" + > + </File> + <File + RelativePath=".\bn_mp_or.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_fermat.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_is_divisible.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_is_prime.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_miller_rabin.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_next_prime.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_rabin_miller_trials.c" + > + </File> + <File + RelativePath=".\bn_mp_prime_random_ex.c" + > + </File> + <File + RelativePath=".\bn_mp_radix_size.c" + > + </File> + <File + RelativePath=".\bn_mp_radix_smap.c" + > + </File> + <File + RelativePath=".\bn_mp_rand.c" + > + </File> + <File + RelativePath=".\bn_mp_read_radix.c" + > + </File> + <File + RelativePath=".\bn_mp_read_signed_bin.c" + > + </File> + <File + RelativePath=".\bn_mp_read_unsigned_bin.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_2k.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_2k_l.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_2k_setup.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_2k_setup_l.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_is_2k.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_is_2k_l.c" + > + </File> + <File + RelativePath=".\bn_mp_reduce_setup.c" + > + </File> + <File + RelativePath=".\bn_mp_rshd.c" + > + </File> + <File + RelativePath=".\bn_mp_set.c" + > + </File> + <File + RelativePath=".\bn_mp_set_int.c" + > + </File> + <File + RelativePath=".\bn_mp_shrink.c" + > + </File> + <File + RelativePath=".\bn_mp_signed_bin_size.c" + > + </File> + <File + RelativePath=".\bn_mp_sqr.c" + > + </File> + <File + RelativePath=".\bn_mp_sqrmod.c" + > + </File> + <File + RelativePath=".\bn_mp_sqrt.c" + > + </File> + <File + RelativePath=".\bn_mp_sub.c" + > + </File> + <File + RelativePath=".\bn_mp_sub_d.c" + > + </File> + <File + RelativePath=".\bn_mp_submod.c" + > + </File> + <File + RelativePath=".\bn_mp_to_signed_bin.c" + > + </File> + <File + RelativePath=".\bn_mp_to_signed_bin_n.c" + > + </File> + <File + RelativePath=".\bn_mp_to_unsigned_bin.c" + > + </File> + <File + RelativePath=".\bn_mp_to_unsigned_bin_n.c" + > + </File> + <File + RelativePath=".\bn_mp_toom_mul.c" + > + </File> + <File + RelativePath=".\bn_mp_toom_sqr.c" + > + </File> + <File + RelativePath=".\bn_mp_toradix.c" + > + </File> + <File + RelativePath=".\bn_mp_toradix_n.c" + > + </File> + <File + RelativePath=".\bn_mp_unsigned_bin_size.c" + > + </File> + <File + RelativePath=".\bn_mp_xor.c" + > + </File> + <File + RelativePath=".\bn_mp_zero.c" + > + </File> + <File + RelativePath=".\bn_prime_tab.c" + > + </File> + <File + RelativePath=".\bn_reverse.c" + > + </File> + <File + RelativePath=".\bn_s_mp_add.c" + > + </File> + <File + RelativePath=".\bn_s_mp_exptmod.c" + > + </File> + <File + RelativePath=".\bn_s_mp_mul_digs.c" + > + </File> + <File + RelativePath=".\bn_s_mp_mul_high_digs.c" + > + </File> + <File + RelativePath=".\bn_s_mp_sqr.c" + > + </File> + <File + RelativePath=".\bn_s_mp_sub.c" + > + </File> + <File + RelativePath=".\bncore.c" + > + </File> + <File + RelativePath=".\tommath.h" + > + </File> + <File + RelativePath=".\tommath_class.h" + > + </File> + <File + RelativePath=".\tommath_superclass.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Copied: firebird/trunk/extern/libtommath/libtommath_MSVC9.sln (from rev 53770, firebird/trunk/extern/libtommath/libtommath_VS2008.sln) =================================================================== --- firebird/trunk/extern/libtommath/libtommath_MSVC9.sln (rev 0) +++ firebird/trunk/extern/libtommath/libtommath_MSVC9.sln 2011-12-28 15:15:32 UTC (rev 53785) @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtommath", "libtommath_MSVC9.vcproj", "{42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Debug|Win32.ActiveCfg = Debug|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Debug|Win32.Build.0 = Debug|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Release|Win32.ActiveCfg = Release|Win32 + {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Copied: firebird/trunk/extern/libtommath/libtommath_MSVC9.vcproj (from rev 53770, firebird/trunk/extern/libtommath/libtommath_VS2008.vcproj) =================================================================== --- firebird/trunk/extern/libtommath/libtommath_MSVC9.vcproj (rev 0) +++ firebird/trunk/extern/libtommath/libtommath_MSVC9.vcproj 2011-12-28 15:15:32 UTC (rev 53785) @@ -0,0 +1,2805 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="libtommath" + ProjectGUID="{42109FEE-B0B9-4FCD-9E56-2863BF8C55D2}" + RootNamespace="libtommath" + TargetFrameworkVersion="0" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\Debug/libtommath.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="Debug\tommath.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libtommath.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libtommath.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="Release\tommath.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libtommath.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="bn_error.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_fast_mp_invmod.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_fast_mp_montgomery_reduce.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_fast_s_mp_mul_digs.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_fast_s_mp_mul_high_digs.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_fast_s_mp_sqr.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_2expt.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_abs.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_add.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_add_d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_addmod.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_and.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_clamp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_clear.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_clear_multi.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_cmp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_cmp_d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_cmp_mag.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_cnt_lsb.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_copy.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_count_bits.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_div.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_div_2.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_div_2d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_div_3.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_div_d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_dr_is_modulus.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_dr_reduce.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_dr_setup.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_exch.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_expt_d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_exptmod.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="bn_mp_exptmo... [truncated message content] |
From: <fir...@us...> - 2011-12-29 03:23:14
|
Revision: 53789 http://firebird.svn.sourceforge.net/firebird/?rev=53789&view=rev Author: firebirds Date: 2011-12-29 03:23:07 +0000 (Thu, 29 Dec 2011) 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 2011-12-29 00:21:21 UTC (rev 53788) +++ firebird/trunk/ChangeLog 2011-12-29 03:23:07 UTC (rev 53789) @@ -1,3 +1,46 @@ + 2011-12-29 00:21 asfernandes + M builds/posix/Makefile.in + M builds/posix/make.defaults +Make the thing build with Ubuntu 11.10, binutils 2.21.53.20110810. +Was failing to build 'firebird' caused by common.a (BigInteger.o) usage of libtommath functions. + + 2011-12-28 18:16 dimitr + M src/remote/client/interface.cpp + M src/remote/inet.cpp +Misc. + + 2011-12-28 15:15 hvlad + M builds/win32/make_boot.bat + A extern/libtommath/libtommath_MSVC10.sln (from /firebird/trunk/extern/libtommath/libtommath_VS2010.sln:53770) + A extern/libtommath/libtommath_MSVC10.vcxproj (from /firebird/trunk/extern/libtommath/libtommath_VS2010.vcxproj:53771) + A extern/libtommath/libtommath_MSVC8.sln (from /firebird/trunk/extern/libtommath/libtommath_VS2005.sln:53783) + A extern/libtommath/libtommath_MSVC8.vcproj (from /firebird/trunk/extern/libtommath/libtommath_VS2005.vcproj:53783) + A extern/libtommath/libtommath_MSVC9.sln (from /firebird/trunk/extern/libtommath/libtommath_VS2008.sln:53770) + A extern/libtommath/libtommath_MSVC9.vcproj (from /firebird/trunk/extern/libtommath/libtommath_VS2008.vcproj:53770) + D extern/libtommath/libtommath_VS2005.sln + D extern/libtommath/libtommath_VS2005.vcproj + D extern/libtommath/libtommath_VS2008.sln + D extern/libtommath/libtommath_VS2008.vcproj + D extern/libtommath/libtommath_VS2010.sln + D extern/libtommath/libtommath_VS2010.vcxproj +Adjust LibTomMath project files to allow build both Firebird and libtommath library by the same version of MSVC. +Adjust make_boot to automatically choose correct solution to build libtommath. + + 2011-12-28 14:31 hvlad + M builds/win32/msvc8/Firebird3.sln + M builds/win32/msvc8/common.vcproj + M builds/win32/msvc8/fbserver.vcproj + M builds/win32/msvc8/firebird2.vsprops + M builds/win32/msvc8/remote.vcproj + A builds/win32/msvc8/srp.vcproj + M builds/win32/msvc8/yvalve.vcproj +Update VS 2005 build to support SRP. + + 2011-12-28 14:29 hvlad + M extern/libtommath/libtommath_VS2005.sln + M extern/libtommath/libtommath_VS2005.vcproj +Cleanup, tune and add x64 target + 2011-12-28 01:20 asfernandes M src/dsql/ExprNodes.cpp M src/dsql/ExprNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-29 00:21:21 UTC (rev 53788) +++ firebird/trunk/src/jrd/build_no.h 2011-12-29 03:23:07 UTC (rev 53789) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29684 + FORMAL BUILD NUMBER:29689 */ -#define PRODUCT_VER_STRING "3.0.0.29684" -#define FILE_VER_STRING "WI-T3.0.0.29684" -#define LICENSE_VER_STRING "WI-T3.0.0.29684" -#define FILE_VER_NUMBER 3, 0, 0, 29684 +#define PRODUCT_VER_STRING "3.0.0.29689" +#define FILE_VER_STRING "WI-T3.0.0.29689" +#define LICENSE_VER_STRING "WI-T3.0.0.29689" +#define FILE_VER_NUMBER 3, 0, 0, 29689 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29684" +#define FB_BUILD_NO "29689" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-29 00:21:21 UTC (rev 53788) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-29 03:23:07 UTC (rev 53789) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29684 +BuildNum=29689 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...> - 2011-12-30 03:20:03
|
Revision: 53794 http://firebird.svn.sourceforge.net/firebird/?rev=53794&view=rev Author: firebirds Date: 2011-12-30 03:19:57 +0000 (Fri, 30 Dec 2011) 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 2011-12-29 17:48:59 UTC (rev 53793) +++ firebird/trunk/ChangeLog 2011-12-30 03:19:57 UTC (rev 53794) @@ -1,3 +1,14 @@ + 2011-12-29 17:48 alexpeshkoff + M src/common/isc_s_proto.h + M src/common/isc_sync.cpp + A src/common/os/SyncSignals.h + A src/common/os/posix/SyncSignals.cpp + M src/common/thd.cpp + M src/common/thd.h + M src/jrd/ibsetjmp.h + M src/yvalve/MasterImplementation.cpp +Front-ported fix for CORE-3646: Segmentation fault in Linux + 2011-12-29 00:21 asfernandes M builds/posix/Makefile.in M builds/posix/make.defaults Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-29 17:48:59 UTC (rev 53793) +++ firebird/trunk/src/jrd/build_no.h 2011-12-30 03:19:57 UTC (rev 53794) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29689 + FORMAL BUILD NUMBER:29690 */ -#define PRODUCT_VER_STRING "3.0.0.29689" -#define FILE_VER_STRING "WI-T3.0.0.29689" -#define LICENSE_VER_STRING "WI-T3.0.0.29689" -#define FILE_VER_NUMBER 3, 0, 0, 29689 +#define PRODUCT_VER_STRING "3.0.0.29690" +#define FILE_VER_STRING "WI-T3.0.0.29690" +#define LICENSE_VER_STRING "WI-T3.0.0.29690" +#define FILE_VER_NUMBER 3, 0, 0, 29690 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29689" +#define FB_BUILD_NO "29690" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-29 17:48:59 UTC (rev 53793) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-30 03:19:57 UTC (rev 53794) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29689 +BuildNum=29690 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...> - 2011-12-30 14:38:10
|
Revision: 53799 http://firebird.svn.sourceforge.net/firebird/?rev=53799&view=rev Author: asfernandes Date: 2011-12-30 14:38:03 +0000 (Fri, 30 Dec 2011) Log Message: ----------- Make UUID_TO_CHAR2 returns lower-cased strings, as the RFC specifies?\194?\183 Modified Paths: -------------- firebird/trunk/doc/sql.extensions/README.builtin_functions.txt firebird/trunk/src/common/os/guid.h Modified: firebird/trunk/doc/sql.extensions/README.builtin_functions.txt =================================================================== --- firebird/trunk/doc/sql.extensions/README.builtin_functions.txt 2011-12-30 14:19:47 UTC (rev 53798) +++ firebird/trunk/doc/sql.extensions/README.builtin_functions.txt 2011-12-30 14:38:03 UTC (rev 53799) @@ -261,7 +261,7 @@ Function: Converts the CHAR(32) ASCII representation of an UUID - (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX) to the CHAR(16) OCTETS + (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx) to the CHAR(16) OCTETS representation (optimized for storage). Format: @@ -888,7 +888,7 @@ Function: Converts a CHAR(16) OCTETS UUID (that's returned by GEN_UUID) to the - CHAR(32) ASCII representation (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX). + CHAR(32) ASCII representation (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx). Format: UUID_TO_CHAR2( <string> ) @@ -896,7 +896,8 @@ Notes: This function supersedes UUID_TO_CHAR. The difference between them is that UUID_TO_CHAR does a byte-by-byte conversion of the OCTETS string to the ASCII one, while UUID_TO_CHAR2 converts - a RFC-4122 compliant OCTETS UUID to a compliant ASCII string. + a RFC-4122 compliant OCTETS UUID to a compliant ASCII string. Also, UUID_TO_CHAR returns + upper-cased string and UUID_TO_CHAR2 returns lower-cased string. Example: select uuid_to_char2(gen_uuid()) from rdb$database; Modified: firebird/trunk/src/common/os/guid.h =================================================================== --- firebird/trunk/src/common/os/guid.h 2011-12-30 14:19:47 UTC (rev 53798) +++ firebird/trunk/src/common/os/guid.h 2011-12-30 14:38:03 UTC (rev 53799) @@ -40,8 +40,10 @@ const char* const GUID_LEGACY_FORMAT = "{%04hX%04hX-%04hX-%04hX-%04hX-%04hX%04hX%04hX}"; -const char* const GUID_NEW_FORMAT = +const char* const GUID_NEW_FORMAT_UPPER = "{%02hX%02hX%02hX%02hX-%02hX%02hX-%02hX%02hX-%02hX%02hX-%02hX%02hX%02hX%02hX%02hX%02hX}"; +const char* const GUID_NEW_FORMAT_LOWER = + "{%02hx%02hx%02hx%02hx-%02hx%02hx-%02hx%02hx-%02hx%02hx-%02hx%02hx%02hx%02hx%02hx%02hx}"; struct Guid { @@ -82,7 +84,7 @@ break; case Guid::STYLE_BROKEN: - sprintf(buffer, GUID_NEW_FORMAT, + sprintf(buffer, GUID_NEW_FORMAT_UPPER, USHORT(guid->data[0] & 0xFF), USHORT(guid->data[0] >> 8), USHORT(guid->data[1] & 0xFF), USHORT(guid->data[1] >> 8), USHORT(guid->data[2] & 0xFF), USHORT(guid->data[2] >> 8), @@ -94,7 +96,7 @@ break; case Guid::STYLE_UUID: - sprintf(buffer, GUID_NEW_FORMAT, + sprintf(buffer, GUID_NEW_FORMAT_LOWER, USHORT((guid->data1 >> 24) & 0xFF), USHORT((guid->data1 >> 16) & 0xFF), USHORT((guid->data1 >> 8) & 0xFF), USHORT(guid->data1 & 0xFF), USHORT((guid->data2 >> 8) & 0xFF), USHORT(guid->data2 & 0xFF), @@ -118,7 +120,7 @@ else { USHORT bytes[16]; - sscanf(buffer, GUID_NEW_FORMAT, + sscanf(buffer, GUID_NEW_FORMAT_LOWER, &bytes[0], &bytes[1], &bytes[2], &bytes[3], &bytes[4], &bytes[5], &bytes[6], &bytes[7], &bytes[8], &bytes[9], &bytes[10], &bytes[11], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2011-12-31 03:22:02
|
Revision: 53801 http://firebird.svn.sourceforge.net/firebird/?rev=53801&view=rev Author: firebirds Date: 2011-12-31 03:21:54 +0000 (Sat, 31 Dec 2011) 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 2011-12-30 14:46:41 UTC (rev 53800) +++ firebird/trunk/ChangeLog 2011-12-31 03:21:54 UTC (rev 53801) @@ -1,3 +1,21 @@ + 2011-12-30 14:38 asfernandes + M doc/sql.extensions/README.builtin_functions.txt + M src/common/os/guid.h +Make UUID_TO_CHAR2 returns lower-cased strings, as the RFC specifies?\194?\183 + + 2011-12-30 14:19 alexpeshkoff + M src/jrd/svc.cpp +Small correction for CORE-3658 + + 2011-12-30 14:11 alexpeshkoff + M src/burp/burp.cpp + M src/utilities/fbtracemgr/traceMgrMain.cpp + M src/utilities/gsec/gsec.cpp + M src/yvalve/utl.cpp + M src/yvalve/utl_proto.h + M src/yvalve/why.cpp +Fixed CORE-3658: FBSVCMGR connects to server as OS user name rather than value of ISC_USER environment variable + 2011-12-29 17:48 alexpeshkoff M src/common/isc_s_proto.h M src/common/isc_sync.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2011-12-30 14:46:41 UTC (rev 53800) +++ firebird/trunk/src/jrd/build_no.h 2011-12-31 03:21:54 UTC (rev 53801) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29690 + FORMAL BUILD NUMBER:29693 */ -#define PRODUCT_VER_STRING "3.0.0.29690" -#define FILE_VER_STRING "WI-T3.0.0.29690" -#define LICENSE_VER_STRING "WI-T3.0.0.29690" -#define FILE_VER_NUMBER 3, 0, 0, 29690 +#define PRODUCT_VER_STRING "3.0.0.29693" +#define FILE_VER_STRING "WI-T3.0.0.29693" +#define LICENSE_VER_STRING "WI-T3.0.0.29693" +#define FILE_VER_NUMBER 3, 0, 0, 29693 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29690" +#define FB_BUILD_NO "29693" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2011-12-30 14:46:41 UTC (rev 53800) +++ firebird/trunk/src/misc/writeBuildNum.sh 2011-12-31 03:21:54 UTC (rev 53801) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29690 +BuildNum=29693 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...> - 2012-01-03 03:21:23
|
Revision: 53806 http://firebird.svn.sourceforge.net/firebird/?rev=53806&view=rev Author: firebirds Date: 2012-01-03 03:21:16 +0000 (Tue, 03 Jan 2012) 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 2012-01-02 11:28:09 UTC (rev 53805) +++ firebird/trunk/ChangeLog 2012-01-03 03:21:16 UTC (rev 53806) @@ -1,3 +1,13 @@ + 2012-01-02 11:28 hvlad + M extern/libtommath/libtommath_MSVC10.sln + M extern/libtommath/libtommath_MSVC10.vcxproj +Correction + + 2012-01-02 11:14 hvlad + D builds/win32/msvc10/srp.filters + A builds/win32/msvc10/srp.vcxproj.filters (from /firebird/trunk/builds/win32/msvc10/srp.filters:53803) +Misc + 2011-12-30 14:38 asfernandes M doc/sql.extensions/README.builtin_functions.txt M src/common/os/guid.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-02 11:28:09 UTC (rev 53805) +++ firebird/trunk/src/jrd/build_no.h 2012-01-03 03:21:16 UTC (rev 53806) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29693 + FORMAL BUILD NUMBER:29695 */ -#define PRODUCT_VER_STRING "3.0.0.29693" -#define FILE_VER_STRING "WI-T3.0.0.29693" -#define LICENSE_VER_STRING "WI-T3.0.0.29693" -#define FILE_VER_NUMBER 3, 0, 0, 29693 +#define PRODUCT_VER_STRING "3.0.0.29695" +#define FILE_VER_STRING "WI-T3.0.0.29695" +#define LICENSE_VER_STRING "WI-T3.0.0.29695" +#define FILE_VER_NUMBER 3, 0, 0, 29695 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29693" +#define FB_BUILD_NO "29695" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-02 11:28:09 UTC (rev 53805) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-03 03:21:16 UTC (rev 53806) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29693 +BuildNum=29695 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...> - 2012-01-04 03:21:58
|
Revision: 53810 http://firebird.svn.sourceforge.net/firebird/?rev=53810&view=rev Author: firebirds Date: 2012-01-04 03:21:51 +0000 (Wed, 04 Jan 2012) 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 2012-01-03 18:26:51 UTC (rev 53809) +++ firebird/trunk/ChangeLog 2012-01-04 03:21:51 UTC (rev 53810) @@ -1,3 +1,21 @@ + 2012-01-03 18:26 dimitr + M src/remote/server/os/win32/window.cpp +Totally misc. + + 2012-01-03 18:06 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/protocol.h + M src/remote/remote.h + M src/remote/server/server.cpp +Removed the outdated RPC support + some misc cleanup. + + 2012-01-03 16:14 alexpeshkoff + M src/auth/SecureRemotePassword/manage/SrpManagement.cpp +Make SRP management plugin notify caller when user to alter/drop is missing + 2012-01-02 11:28 hvlad M extern/libtommath/libtommath_MSVC10.sln M extern/libtommath/libtommath_MSVC10.vcxproj Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-03 18:26:51 UTC (rev 53809) +++ firebird/trunk/src/jrd/build_no.h 2012-01-04 03:21:51 UTC (rev 53810) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29695 + FORMAL BUILD NUMBER:29698 */ -#define PRODUCT_VER_STRING "3.0.0.29695" -#define FILE_VER_STRING "WI-T3.0.0.29695" -#define LICENSE_VER_STRING "WI-T3.0.0.29695" -#define FILE_VER_NUMBER 3, 0, 0, 29695 +#define PRODUCT_VER_STRING "3.0.0.29698" +#define FILE_VER_STRING "WI-T3.0.0.29698" +#define LICENSE_VER_STRING "WI-T3.0.0.29698" +#define FILE_VER_NUMBER 3, 0, 0, 29698 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29695" +#define FB_BUILD_NO "29698" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-03 18:26:51 UTC (rev 53809) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-04 03:21:51 UTC (rev 53810) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29695 +BuildNum=29698 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...> - 2012-01-05 03:22:19
|
Revision: 53812 http://firebird.svn.sourceforge.net/firebird/?rev=53812&view=rev Author: firebirds Date: 2012-01-05 03:22:12 +0000 (Thu, 05 Jan 2012) 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 2012-01-05 01:07:06 UTC (rev 53811) +++ firebird/trunk/ChangeLog 2012-01-05 03:22:12 UTC (rev 53812) @@ -1,3 +1,8 @@ + 2012-01-05 01:07 asfernandes + M src/common/os/posix/SyncSignals.cpp + M src/remote/server/os/win32/srvr_w32.cpp +Misc. + 2012-01-03 18:26 dimitr M src/remote/server/os/win32/window.cpp Totally misc. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-05 01:07:06 UTC (rev 53811) +++ firebird/trunk/src/jrd/build_no.h 2012-01-05 03:22:12 UTC (rev 53812) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29698 + FORMAL BUILD NUMBER:29699 */ -#define PRODUCT_VER_STRING "3.0.0.29698" -#define FILE_VER_STRING "WI-T3.0.0.29698" -#define LICENSE_VER_STRING "WI-T3.0.0.29698" -#define FILE_VER_NUMBER 3, 0, 0, 29698 +#define PRODUCT_VER_STRING "3.0.0.29699" +#define FILE_VER_STRING "WI-T3.0.0.29699" +#define LICENSE_VER_STRING "WI-T3.0.0.29699" +#define FILE_VER_NUMBER 3, 0, 0, 29699 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29698" +#define FB_BUILD_NO "29699" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-05 01:07:06 UTC (rev 53811) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-05 03:22:12 UTC (rev 53812) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29698 +BuildNum=29699 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...> - 2012-01-07 03:21:57
|
Revision: 53817 http://firebird.svn.sourceforge.net/firebird/?rev=53817&view=rev Author: firebirds Date: 2012-01-07 03:21:50 +0000 (Sat, 07 Jan 2012) 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 2012-01-07 02:30:42 UTC (rev 53816) +++ firebird/trunk/ChangeLog 2012-01-07 03:21:50 UTC (rev 53817) @@ -1,3 +1,30 @@ + 2012-01-07 02:30 dimitr + M src/jrd/btr.cpp + M src/jrd/ods.h +Cleanup. We don't need a separately stored global index selectivity for along time already. + + 2012-01-06 14:33 asfernandes + M src/dsql/StmtNodes.cpp + M src/dsql/parse.y +Improvement CORE-3343 - RETURNING clause is not supported in positioned (WHERE CURRENT OF) UPDATE and DELETE statements. + + 2012-01-06 11:25 dimitr + M src/common/sdl.cpp + M src/common/sdl_proto.h +Removed support for the remote protocol versions prior to v10. + + 2012-01-06 11:24 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/parse_proto.h + M src/remote/parser.cpp + M src/remote/protocol.cpp + M src/remote/protocol.h + M src/remote/server/server.cpp +Removed support for the remote protocol versions prior to v10. + 2012-01-05 01:07 asfernandes M src/common/os/posix/SyncSignals.cpp M src/remote/server/os/win32/srvr_w32.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-07 02:30:42 UTC (rev 53816) +++ firebird/trunk/src/jrd/build_no.h 2012-01-07 03:21:50 UTC (rev 53817) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29699 + FORMAL BUILD NUMBER:29703 */ -#define PRODUCT_VER_STRING "3.0.0.29699" -#define FILE_VER_STRING "WI-T3.0.0.29699" -#define LICENSE_VER_STRING "WI-T3.0.0.29699" -#define FILE_VER_NUMBER 3, 0, 0, 29699 +#define PRODUCT_VER_STRING "3.0.0.29703" +#define FILE_VER_STRING "WI-T3.0.0.29703" +#define LICENSE_VER_STRING "WI-T3.0.0.29703" +#define FILE_VER_NUMBER 3, 0, 0, 29703 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29699" +#define FB_BUILD_NO "29703" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-07 02:30:42 UTC (rev 53816) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-07 03:21:50 UTC (rev 53817) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29699 +BuildNum=29703 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2012-01-08 18:34:06
|
Revision: 53820 http://firebird.svn.sourceforge.net/firebird/?rev=53820&view=rev Author: dimitr Date: 2012-01-08 18:33:59 +0000 (Sun, 08 Jan 2012) Log Message: ----------- Refactored CREATE/ALTER USER. Untested at runtime. Modified Paths: -------------- firebird/trunk/lang_helpers/gds_codes.ftn firebird/trunk/lang_helpers/gds_codes.pas firebird/trunk/src/dsql/DdlNodes.epp firebird/trunk/src/dsql/DdlNodes.h firebird/trunk/src/dsql/ddl.cpp firebird/trunk/src/dsql/node.h firebird/trunk/src/dsql/parse.y firebird/trunk/src/dsql/pass1.cpp firebird/trunk/src/include/gen/codetext.h firebird/trunk/src/include/gen/iberror.h firebird/trunk/src/include/gen/msgs.h firebird/trunk/src/include/gen/sql_code.h firebird/trunk/src/include/gen/sql_state.h firebird/trunk/src/jrd/dyn.epp firebird/trunk/src/msgs/facilities2.sql firebird/trunk/src/msgs/messages2.sql firebird/trunk/src/msgs/system_errors2.sql Modified: firebird/trunk/lang_helpers/gds_codes.ftn =================================================================== --- firebird/trunk/lang_helpers/gds_codes.ftn 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/lang_helpers/gds_codes.ftn 2012-01-08 18:33:59 UTC (rev 53820) @@ -1724,6 +1724,8 @@ PARAMETER (GDS__dyn_coll_used_function = 336068889) INTEGER*4 GDS__dyn_domain_used_function PARAMETER (GDS__dyn_domain_used_function = 336068890) + INTEGER*4 GDS__dyn_alter_user_no_clause + PARAMETER (GDS__dyn_alter_user_no_clause = 336068891) INTEGER*4 GDS__gbak_unknown_switch PARAMETER (GDS__gbak_unknown_switch = 336330753) INTEGER*4 GDS__gbak_page_size_missing @@ -2144,6 +2146,10 @@ PARAMETER (GDS__dsql_create_filter_failed = 336397315) INTEGER*4 GDS__dsql_create_index_failed PARAMETER (GDS__dsql_create_index_failed = 336397316) + INTEGER*4 GDS__dsql_create_user_failed + PARAMETER (GDS__dsql_create_user_failed = 336397317) + INTEGER*4 GDS__dsql_alter_user_failed + PARAMETER (GDS__dsql_alter_user_failed = 336397318) INTEGER*4 GDS__gsec_cant_open_db PARAMETER (GDS__gsec_cant_open_db = 336723983) INTEGER*4 GDS__gsec_switches_error Modified: firebird/trunk/lang_helpers/gds_codes.pas =================================================================== --- firebird/trunk/lang_helpers/gds_codes.pas 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/lang_helpers/gds_codes.pas 2012-01-08 18:33:59 UTC (rev 53820) @@ -869,6 +869,7 @@ gds_dyn_routine_param_ambiguous = 336068888; gds_dyn_coll_used_function = 336068889; gds_dyn_domain_used_function = 336068890; + gds_dyn_alter_user_no_clause = 336068891; gds_gbak_unknown_switch = 336330753; gds_gbak_page_size_missing = 336330754; gds_gbak_page_size_toobig = 336330755; @@ -1079,6 +1080,8 @@ gds_dsql_create_shadow_failed = 336397314; gds_dsql_create_filter_failed = 336397315; gds_dsql_create_index_failed = 336397316; + gds_dsql_create_user_failed = 336397317; + gds_dsql_alter_user_failed = 336397318; gds_gsec_cant_open_db = 336723983; gds_gsec_switches_error = 336723984; gds_gsec_no_op_spec = 336723985; Modified: firebird/trunk/src/dsql/DdlNodes.epp =================================================================== --- firebird/trunk/src/dsql/DdlNodes.epp 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/dsql/DdlNodes.epp 2012-01-08 18:33:59 UTC (rev 53820) @@ -9647,6 +9647,110 @@ //---------------------- +void CreateAlterUserNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const +{ + text.printf( + "CreateAlterUserNode\n" + " name: '%s'\n", + name.c_str()); +} + +void CreateAlterUserNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_tra* transaction) +{ + if (!isCreating && !password && !firstName && !middleName && !lastName && !adminRole.specified) + { + // 283: ALTER USER requires at least one clause to be specified + status_exception::raise(Arg::Gds(ENCODE_ISC_MSG(283, DYN_MSG_FAC))); + } + + // run all statements under savepoint control + AutoSavePoint savePoint(tdbb, transaction); + + DynamicUserData* userData = FB_NEW(*transaction->tra_pool) DynamicUserData; + + string text = name.c_str(); + text.upper(); + + userData->op = isCreating ? ADD_OPER : MOD_OPER; + userData->user.set(text.c_str()); + userData->user.setEntered(1); + + if (password) + { + if (password->isEmpty()) + { + // 250: Password should not be empty string + status_exception::raise(Arg::Gds(ENCODE_ISC_MSG(250, DYN_MSG_FAC))); + } + + userData->pass.set(password->c_str()); + userData->pass.setEntered(1); + } + + if (firstName) + { + if (firstName->hasData()) + { + userData->first.set(firstName->c_str()); + userData->first.setEntered(1); + } + else + { + userData->first.setEntered(0); + userData->first.setSpecified(1); + } + } + + if (middleName) + { + if (middleName->hasData()) + { + userData->first.set(middleName->c_str()); + userData->first.setEntered(1); + } + else + { + userData->first.setEntered(0); + userData->first.setSpecified(1); + } + } + + if (lastName) + { + if (lastName->hasData()) + { + userData->first.set(lastName->c_str()); + userData->first.setEntered(1); + } + else + { + userData->first.setEntered(0); + userData->first.setSpecified(1); + } + } + + if (adminRole.specified) + { + userData->adm.set(adminRole.value); + userData->adm.setEntered(1); + } + + const int ddlAction = isCreating ? DDL_TRIGGER_CREATE_USER : DDL_TRIGGER_ALTER_USER; + + executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_BEFORE, ddlAction, userData->user.get()); + + const USHORT id = transaction->getUserManagement()->put(userData); + DFW_post_work(transaction, dfw_user_management, NULL, id); + + executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_AFTER, ddlAction, userData->user.get()); + + savePoint.release(); // everything is ok +} + + +//---------------------- + + void DropUserNode::print(string& text, Array<dsql_nod*>& /*nodes*/) const { text.printf( @@ -9672,7 +9776,7 @@ executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_BEFORE, DDL_TRIGGER_DROP_USER, userData->user.get()); - USHORT id = transaction->getUserManagement()->put(userData); + const USHORT id = transaction->getUserManagement()->put(userData); DFW_post_work(transaction, dfw_user_management, NULL, id); executeDdlTrigger(tdbb, dsqlScratch, transaction, DTW_AFTER, DDL_TRIGGER_DROP_USER, Modified: firebird/trunk/src/dsql/DdlNodes.h =================================================================== --- firebird/trunk/src/dsql/DdlNodes.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/dsql/DdlNodes.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -1607,6 +1607,38 @@ }; +class CreateAlterUserNode : public DdlNode +{ +public: + CreateAlterUserNode(MemoryPool& p, bool creating, const Firebird::MetaName& aName) + : DdlNode(p), + isCreating(creating), + name(p, aName) + { + } + +public: + virtual void print(Firebird::string& text, Firebird::Array<dsql_nod*>& nodes) const; + virtual void execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratch, jrd_tra* transaction); + +protected: + virtual void putErrorPrefix(Firebird::Arg::StatusVector& statusVector) + { + statusVector << Firebird::Arg::Gds(isCreating ? + isc_dsql_create_user_failed : isc_dsql_alter_user_failed) << name; + } + +public: + const bool isCreating; + const Firebird::MetaName name; + const Firebird::string* password; + const Firebird::string* firstName; + const Firebird::string* middleName; + const Firebird::string* lastName; + Nullable<int> adminRole; +}; + + class DropUserNode : public DdlNode { public: Modified: firebird/trunk/src/dsql/ddl.cpp =================================================================== --- firebird/trunk/src/dsql/ddl.cpp 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/dsql/ddl.cpp 2012-01-08 18:33:59 UTC (rev 53820) @@ -124,7 +124,6 @@ static char modify_privileges(DsqlCompilerScratch*, NOD_TYPE, SSHORT, const dsql_nod*, const dsql_nod*, const dsql_nod*, const dsql_nod*); static void process_role_nm_list(DsqlCompilerScratch*, SSHORT, const dsql_nod*, const dsql_nod*, NOD_TYPE, const dsql_nod*); -static void define_user(DsqlCompilerScratch*, UCHAR); static void put_grantor(DsqlCompilerScratch* dsqlScratch, const dsql_nod* grantor); static void post_607(const Arg::StatusVector& v); static void put_user_grant(DsqlCompilerScratch* dsqlScratch, const dsql_nod* user); @@ -603,14 +602,6 @@ grant_revoke(dsqlScratch); break; - case nod_add_user: - define_user(dsqlScratch, isc_dyn_user_add); - break; - - case nod_mod_user: - define_user(dsqlScratch, isc_dyn_user_mod); - break; - default: // CVC: Shouldn't we complain here? break; } @@ -930,73 +921,6 @@ } -// ********************* -// d e f i n e _ u s e r -// ********************* -// Support SQL operator create/alter/drop user -static void define_user(DsqlCompilerScratch* dsqlScratch, UCHAR op) -{ - DsqlCompiledStatement* statement = dsqlScratch->getStatement(); - - dsqlScratch->appendUChar(isc_dyn_user); - - const dsql_nod* node = statement->getDdlNode(); - int argCount = 0; - - for (int i = 0; i < node->nod_count; ++i) - { - const dsql_str* ds = (dsql_str*) node->nod_arg[i]; - if (! ds) - { - if (i == e_user_name || (i == e_user_passwd && op == isc_dyn_user_add)) - { - ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) << - // Unexpected end of command - Arg::Gds(isc_command_end_err2) << Arg::Num(node->nod_line) << - Arg::Num(node->nod_column)); - } - - continue; - } - - ++argCount; - - switch (i) - { - case e_user_name: - dsqlScratch->appendNullString(op, ds->str_data); - break; - case e_user_passwd: - dsqlScratch->appendNullString(isc_dyn_user_passwd, ds->str_data); - break; - case e_user_first: - dsqlScratch->appendNullString(isc_dyn_user_first, ds->str_data); - break; - case e_user_middle: - dsqlScratch->appendNullString(isc_dyn_user_middle, ds->str_data); - break; - case e_user_last: - dsqlScratch->appendNullString(isc_dyn_user_last, ds->str_data); - break; - case e_user_admin: - dsqlScratch->appendNullString(isc_dyn_user_admin, ds->str_data); - break; - } - } - - if (argCount < 2) - { - ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) << - // Unexpected end of command - Arg::Gds(isc_command_end_err2) << Arg::Num(node->nod_line) << - Arg::Num(node->nod_column)); - } - - dsqlScratch->appendUChar(isc_user_end); - dsqlScratch->appendUChar(isc_dyn_end); -} - - static void process_role_nm_list(DsqlCompilerScratch* dsqlScratch, SSHORT option, const dsql_nod* user_ptr, Modified: firebird/trunk/src/dsql/node.h =================================================================== --- firebird/trunk/src/dsql/node.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/dsql/node.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -126,8 +126,6 @@ nod_tra_misc, nod_lock_timeout, nod_with, - nod_add_user, - nod_mod_user, nod_class_stmtnode, nod_class_exprnode, nod_package_name, Modified: firebird/trunk/src/dsql/parse.y =================================================================== --- firebird/trunk/src/dsql/parse.y 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/dsql/parse.y 2012-01-08 18:33:59 UTC (rev 53820) @@ -634,6 +634,7 @@ Firebird::Array<Jrd::dsql_nod*>* legacyArray; Jrd::ReturningClause* returningClause; Firebird::PathName* pathNamePtr; + Firebird::string* stringPtr; TEXT* textPtr; Jrd::DbFileClause* dbFileClause; Firebird::Array<Jrd::DbFileClause*>* dbFilesClause; @@ -679,7 +680,7 @@ %type <legacyNode> alter_data_type_or_domain %type <legacyNode> alter_op alter_ops %type <stmtNode> alter_sequence_clause -%type <legacyNode> alter_user_clause +%type <ddlNode> alter_user_clause %type <legacyNode> array_element array_range %type <ddlNode> alter_exception_clause alter_index_clause alter_role_clause alter_udf_clause %type <ddlNode> alter_view_clause @@ -691,7 +692,7 @@ %type <legacyNode> array_spec array_type %type <stmtNode> assignment %type <compoundStmtNode> assignments -%type <legacyStr> admin_opt +%type <nullableIntVal> admin_opt %type <legacyNode> blob_io blob_segsize blob_subtype blob_subtype_io %type <filterNameNumber> blob_filter_subtype @@ -715,7 +716,8 @@ %type <legacyNode> computed_by computed_clause constant constraint_index_opt %type <boolVal> conditional %type <legacyNode> constraint_name_opt correlation_name create -%type <legacyNode> create_clause create_user_clause cross_join +%type <ddlNode> create_user_clause +%type <legacyNode> create_clause cross_join %type <legacyNode> cursor_clause cursor_def %type <ddlNode> create_or_alter %type <stmtNode> cursor_declaration_item continue cursor_statement @@ -758,7 +760,7 @@ %type <legacyNode> from_list %type <ddlNode> filter_decl_clause %type <stmtNode> for_select full_proc_block full_proc_block_body -%type <legacyStr> firstname_opt +%type <stringPtr> firstname_opt %type file_clause(<dbFileClause>) file_desc(<dbFileClause>) file_desc1(<dbFileClause>) %type fetch_scroll(<cursorStmtNode>) %type <int32Val> first_file_length @@ -767,7 +769,7 @@ %type <legacyNode> generated_always_clause grant grant_option granted_by granted_by_text grantee grantee_list %type <legacyNode> grantor group_by_item group_by_list group_clause %type <ddlNode> gtt_recreate_clause -%type <legacyStr> grant_admin grant_admin_opt +%type <nullableIntVal> grant_admin grant_admin_opt %type <legacyNode> having_clause @@ -789,7 +791,7 @@ %type <stmtNode> local_declaration local_declaration_item %type <compoundStmtNode> local_declaration_list local_declarations %type <legacyNode> lock_clause lock_mode lock_type lock_wait -%type <legacyStr> lastname_opt +%type <stringPtr> lastname_opt %type <int32Val> long_integer %type <boolVal> manual_auto @@ -797,7 +799,8 @@ %type merge_insert_specification(<mergeNode>) merge_update_specification(<mergeNode>) %type merge_when_clause(<mergeNode>) merge_when_matched_clause(<mergeNode>) %type merge_when_not_matched_clause(<mergeNode>) -%type <legacyStr> middlename_opt module_op +%type <stringPtr> middlename_opt +%type <legacyStr> module_op %type <legacyNode> named_columns_join national_character_keyword %type <legacyNode> national_character_type natural_join @@ -825,7 +828,7 @@ %type <legacyArray> proc_outputs_opt %type <stmtNode> post_event proc_block proc_statement %type <compoundStmtNode> proc_statements -%type <legacyStr> passwd_clause passwd_opt +%type <stringPtr> passwd_clause passwd_opt %type <int32Val> pos_short_integer precision_opt %type <legacyNode> qualified_join query_spec query_term @@ -843,7 +846,7 @@ %type <legacyNode> role_name role_name_list rollback rows_clause %type <ddlNode> role_clause rtable_clause %type <ddlNode> rview_clause -%type <legacyStr> revoke_admin +%type <nullableIntVal> revoke_admin %type <legacyNode> savepoint scroll_opt search_condition searched_case %type <valueIfNode> searched_when_clause @@ -1363,7 +1366,7 @@ | COLLATION collation_clause { $$ = makeClassNode($2); } | USER create_user_clause - { $$ = $2; } + { $$ = makeClassNode($2); } | PACKAGE package_clause { $$ = makeClassNode($2); } | PACKAGE BODY package_body_clause @@ -3261,7 +3264,7 @@ | ROLE alter_role_clause { $$ = makeClassNode($2); } | USER alter_user_clause - { $$ = $2; } + { $$ = makeClassNode($2); } | CHARACTER SET alter_charset_clause { $$ = makeClassNode($3); } ; @@ -5386,57 +5389,88 @@ create_user_clause : symbol_user_name passwd_clause firstname_opt middlename_opt lastname_opt grant_admin_opt - { $$ = make_node(nod_add_user, (int) e_user_count, $1, $2, $3, $4, $5, $6); } + { + CreateAlterUserNode* node = newNode<CreateAlterUserNode>(true, toName($1)); + node->password = $2; + node->firstName = $3; + node->middleName = $4; + node->lastName = $5; + node->adminRole = $6; + $$ = node; + } ; alter_user_clause - : symbol_user_name passwd_opt firstname_opt middlename_opt lastname_opt admin_opt - { $$ = make_node(nod_mod_user, (int) e_user_count, $1, $2, $3, $4, $5, $6); } - | symbol_user_name SET passwd_opt firstname_opt middlename_opt lastname_opt admin_opt - { $$ = make_node(nod_mod_user, (int) e_user_count, $1, $3, $4, $5, $6, $7); } + : symbol_user_name set_noise passwd_opt firstname_opt middlename_opt lastname_opt admin_opt + { + CreateAlterUserNode* node = newNode<CreateAlterUserNode>(false, toName($1)); + node->password = $3; + node->firstName = $4; + node->middleName = $5; + node->lastName = $6; + node->adminRole = $7; + $$ = node; + } ; passwd_clause - : PASSWORD sql_string { $$ = $2; } + : PASSWORD sql_string + { $$ = newNode<string>($2->str_data, $2->str_length); } ; +set_noise + : // nothing + | SET + ; + passwd_opt - : /* nothing */ { $$ = NULL; } - | passwd_clause { $$ = $1; } + : // nothing + { $$ = NULL; } + | passwd_clause ; firstname_opt - : /* nothing */ { $$ = NULL; } - | FIRSTNAME sql_string { $$ = $2; } + : // nothing + { $$ = NULL; } + | FIRSTNAME sql_string + { $$ = newNode<string>($2->str_data, $2->str_length); } ; middlename_opt - : /* nothing */ { $$ = NULL; } - | MIDDLENAME sql_string { $$ = $2; } + : // nothing + { $$ = NULL; } + | MIDDLENAME sql_string + { $$ = newNode<string>($2->str_data, $2->str_length); } ; lastname_opt - : /* nothing */ { $$ = NULL; } - | LASTNAME sql_string { $$ = $2; } + : // nothing + { $$ = NULL; } + | LASTNAME sql_string + { $$ = newNode<string>($2->str_data, $2->str_length); } ; admin_opt - : /* nothing */ { $$ = NULL; } + : // nothing + { $$ = Nullable<int>::empty(); } | revoke_admin | grant_admin ; grant_admin_opt - : /* nothing */ { $$ = NULL; } - | grant_admin { $$ = $1; } + : // nothing + { $$ = Nullable<int>::empty(); } + | grant_admin ; revoke_admin - : REVOKE ADMIN ROLE { $$ = MAKE_cstring("0"); } + : REVOKE ADMIN ROLE + { $$ = Nullable<int>::val(0); } ; grant_admin - : GRANT ADMIN ROLE { $$ = MAKE_cstring("1"); } + : GRANT ADMIN ROLE + { $$ = Nullable<int>::val(1); } ; // value types Modified: firebird/trunk/src/dsql/pass1.cpp =================================================================== --- firebird/trunk/src/dsql/pass1.cpp 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/dsql/pass1.cpp 2012-01-08 18:33:59 UTC (rev 53820) @@ -896,8 +896,6 @@ case nod_grant: case nod_revoke: case nod_def_domain: - case nod_add_user: - case nod_mod_user: dsqlScratch->getStatement()->setType(DsqlCompiledStatement::TYPE_DDL); return input; @@ -4969,14 +4967,6 @@ verb = "with"; break; - case nod_add_user: - verb = "add_user"; - break; - - case nod_mod_user: - verb = "mod_user"; - break; - case nod_class_exprnode: case nod_class_stmtnode: reinterpret_cast<Node*>(node->nod_arg[0])->print(verb, subNodes); Modified: firebird/trunk/src/include/gen/codetext.h =================================================================== --- firebird/trunk/src/include/gen/codetext.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/include/gen/codetext.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -858,6 +858,7 @@ {"dyn_routine_param_ambiguous", 336068888}, {"dyn_coll_used_function", 336068889}, {"dyn_domain_used_function", 336068890}, + {"dyn_alter_user_no_clause", 336068891}, {"gbak_unknown_switch", 336330753}, {"gbak_page_size_missing", 336330754}, {"gbak_page_size_toobig", 336330755}, @@ -1068,6 +1069,8 @@ {"dsql_create_shadow_failed", 336397314}, {"dsql_create_filter_failed", 336397315}, {"dsql_create_index_failed", 336397316}, + {"dsql_create_user_failed", 336397317}, + {"dsql_alter_user_failed", 336397318}, {"gsec_cant_open_db", 336723983}, {"gsec_switches_error", 336723984}, {"gsec_no_op_spec", 336723985}, Modified: firebird/trunk/src/include/gen/iberror.h =================================================================== --- firebird/trunk/src/include/gen/iberror.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/include/gen/iberror.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -892,6 +892,7 @@ const ISC_STATUS isc_dyn_routine_param_ambiguous = 336068888L; const ISC_STATUS isc_dyn_coll_used_function = 336068889L; const ISC_STATUS isc_dyn_domain_used_function = 336068890L; +const ISC_STATUS isc_dyn_alter_user_no_clause = 336068891L; const ISC_STATUS isc_gbak_unknown_switch = 336330753L; const ISC_STATUS isc_gbak_page_size_missing = 336330754L; const ISC_STATUS isc_gbak_page_size_toobig = 336330755L; @@ -1102,6 +1103,8 @@ const ISC_STATUS isc_dsql_create_shadow_failed = 336397314L; const ISC_STATUS isc_dsql_create_filter_failed = 336397315L; const ISC_STATUS isc_dsql_create_index_failed = 336397316L; +const ISC_STATUS isc_dsql_create_user_failed = 336397317L; +const ISC_STATUS isc_dsql_alter_user_failed = 336397318L; const ISC_STATUS isc_gsec_cant_open_db = 336723983L; const ISC_STATUS isc_gsec_switches_error = 336723984L; const ISC_STATUS isc_gsec_no_op_spec = 336723985L; @@ -1203,7 +1206,7 @@ const ISC_STATUS isc_trace_switch_param_miss = 337182758L; const ISC_STATUS isc_trace_param_act_notcompat = 337182759L; const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L; -const ISC_STATUS isc_err_max = 1147; +const ISC_STATUS isc_err_max = 1150; #else /* c definitions */ @@ -2065,6 +2068,7 @@ #define isc_dyn_routine_param_ambiguous 336068888L #define isc_dyn_coll_used_function 336068889L #define isc_dyn_domain_used_function 336068890L +#define isc_dyn_alter_user_no_clause 336068891L #define isc_gbak_unknown_switch 336330753L #define isc_gbak_page_size_missing 336330754L #define isc_gbak_page_size_toobig 336330755L @@ -2275,6 +2279,8 @@ #define isc_dsql_create_shadow_failed 336397314L #define isc_dsql_create_filter_failed 336397315L #define isc_dsql_create_index_failed 336397316L +#define isc_dsql_create_user_failed 336397317L +#define isc_dsql_alter_user_failed 336397318L #define isc_gsec_cant_open_db 336723983L #define isc_gsec_switches_error 336723984L #define isc_gsec_no_op_spec 336723985L @@ -2376,7 +2382,7 @@ #define isc_trace_switch_param_miss 337182758L #define isc_trace_param_act_notcompat 337182759L #define isc_trace_mandatory_switch_miss 337182760L -#define isc_err_max 1147 +#define isc_err_max 1150 #endif Modified: firebird/trunk/src/include/gen/msgs.h =================================================================== --- firebird/trunk/src/include/gen/msgs.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/include/gen/msgs.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -861,6 +861,7 @@ {336068888, "Parameter @1 of routine @2 is ambiguous (found in both procedures and functions). Use a specifier keyword."}, /* dyn_routine_param_ambiguous */ {336068889, "Collation @1 is used in function @2 (parameter name @3) and cannot be dropped"}, /* dyn_coll_used_function */ {336068890, "Domain @1 is used in function @2 (parameter name @3) and cannot be dropped"}, /* dyn_domain_used_function */ + {336068891, "ALTER USER requires at least one clause to be specified"}, /* dyn_alter_user_no_clause */ {336330753, "found unknown switch"}, /* gbak_unknown_switch */ {336330754, "page size parameter missing"}, /* gbak_page_size_missing */ {336330755, "Page size specified (@1) greater than limit (16384 bytes)"}, /* gbak_page_size_toobig */ @@ -1071,6 +1072,8 @@ {336397314, "CREATE SHADOW @1 failed"}, /* dsql_create_shadow_failed */ {336397315, "DECLARE FILTER @1 failed"}, /* dsql_create_filter_failed */ {336397316, "CREATE INDEX @1 failed"}, /* dsql_create_index_failed */ + {336397317, "CREATE USER @1 failed"}, /* dsql_create_user_failed */ + {336397318, "ALTER USER @1 failed"}, /* dsql_alter_user_failed */ {336723983, "unable to open database"}, /* gsec_cant_open_db */ {336723984, "error in switch specifications"}, /* gsec_switches_error */ {336723985, "no operation specified"}, /* gsec_no_op_spec */ Modified: firebird/trunk/src/include/gen/sql_code.h =================================================================== --- firebird/trunk/src/include/gen/sql_code.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/include/gen/sql_code.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -857,6 +857,7 @@ {336068888, -901}, /* 280 dyn_routine_param_ambiguous */ {336068889, -901}, /* 281 dyn_coll_used_function */ {336068890, -901}, /* 282 dyn_domain_used_function */ + {336068891, -901}, /* 283 dyn_alter_user_no_clause */ {336330753, -901}, /* 1 gbak_unknown_switch */ {336330754, -901}, /* 2 gbak_page_size_missing */ {336330755, -901}, /* 3 gbak_page_size_toobig */ @@ -1067,6 +1068,8 @@ {336397314, -901}, /* 1026 dsql_create_shadow_failed */ {336397315, -901}, /* 1027 dsql_create_filter_failed */ {336397316, -901}, /* 1028 dsql_create_index_failed */ + {336397317, -901}, /* 1029 dsql_create_user_failed */ + {336397318, -901}, /* 1030 dsql_alter_user_failed */ {336723983, -901}, /* 15 gsec_cant_open_db */ {336723984, -901}, /* 16 gsec_switches_error */ {336723985, -901}, /* 17 gsec_no_op_spec */ Modified: firebird/trunk/src/include/gen/sql_state.h =================================================================== --- firebird/trunk/src/include/gen/sql_state.h 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/include/gen/sql_state.h 2012-01-08 18:33:59 UTC (rev 53820) @@ -857,6 +857,7 @@ {336068888, "42000"}, // 280 dyn_routine_param_ambiguous {336068889, "HY000"}, // 281 dyn_coll_used_function {336068890, "HY000"}, // 282 dyn_domain_used_function + {336068891, "42000"}, // 283 dyn_alter_user_no_clause {336330753, "00000"}, // 1 gbak_unknown_switch {336330754, "00000"}, // 2 gbak_page_size_missing {336330755, "00000"}, // 3 gbak_page_size_toobig @@ -1067,6 +1068,8 @@ {336397314, "42000"}, // 1026 dsql_create_shadow_failed {336397315, "42000"}, // 1027 dsql_create_filter_failed {336397316, "42000"}, // 1028 dsql_create_index_failed + {336397317, "42000"}, // 1029 dsql_create_user_failed + {336397318, "42000"}, // 1030 dsql_alter_user_failed {336723983, "00000"}, // 15 gsec_cant_open_db {336723984, "00000"}, // 16 gsec_switches_error {336723985, "00000"}, // 17 gsec_no_op_spec Modified: firebird/trunk/src/jrd/dyn.epp =================================================================== --- firebird/trunk/src/jrd/dyn.epp 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/jrd/dyn.epp 2012-01-08 18:33:59 UTC (rev 53820) @@ -95,7 +95,6 @@ static void store_privilege(Global*, const MetaName&, const MetaName&, const MetaName&, const TEXT*, SSHORT, SSHORT, int, const MetaName&); static void set_field_class_name(Global*, const MetaName&, const MetaName&); -static void dyn_user(Global*, const UCHAR**); void DYN_ddl(jrd_tra* transaction, ULONG length, const UCHAR* ddl, const string& sqlText) @@ -367,16 +366,6 @@ revoke_all(gbl, ptr); break; - /*** - case isc_dyn_def_role: - create_role (gbl, ptr); - break; - ***/ - - case isc_dyn_user: - dyn_user(gbl, ptr); - break; - default: DYN_unsupported_verb(); break; @@ -1747,157 +1736,3 @@ // msg 79: "STORE RDB$USER_PRIVILEGES failed in grant" } } - - -static void dyn_user(Global* gbl, const UCHAR** ptr) -{ -/************************************** - * - * d y n _ u s e r - * - ************************************** - * - * Functional description - * Implements CREATE/ALTER USER - * - **************************************/ - thread_db* tdbb = JRD_get_thread_data(); - jrd_tra* const tra = tdbb->getTransaction(); - - ISC_STATUS_ARRAY status; - try - { - class DynamicUserData : public Firebird::VersionedIface<Auth::UserData, FB_AUTH_USER_VERSION> - { - public: - -#ifdef DEBUG_GDS_ALLOC - void* operator new(size_t size, Firebird::MemoryPool& pool, const char* fileName, int line) - { - return pool.allocate(size, fileName, line); - } -#else // DEBUG_GDS_ALLOC - void* operator new(size_t size, Firebird::MemoryPool& pool) - { - return pool.allocate(size); - } -#endif // DEBUG_GDS_ALLOC - }; - - DynamicUserData* userData = FB_NEW(*tra->tra_pool) DynamicUserData; - UCHAR verb; - while ((verb = *(*ptr)++) != isc_user_end) - { - string text; - GET_STRING(ptr, text); - - switch (verb) - { - case isc_dyn_user_add: - text.upper(); - userData->op = ADD_OPER; - userData->user.set(text.c_str()); - userData->user.setEntered(1); - break; - - case isc_dyn_user_mod: - text.upper(); - userData->op = MOD_OPER; - userData->user.set(text.c_str()); - userData->user.setEntered(1); - break; - - case isc_dyn_user_passwd: - if (text.isEmpty()) - { - // 250: Password should not be empty string - status_exception::raise(Arg::Gds(ENCODE_ISC_MSG(250, DYN_MSG_FAC))); - } - userData->pass.set(text.c_str()); - userData->pass.setEntered(1); - break; - - case isc_dyn_user_first: - if (text.hasData()) - { - userData->first.set(text.c_str()); - userData->first.setEntered(1); - } - else - { - userData->first.setEntered(0); - userData->first.setSpecified(1); - } - break; - - case isc_dyn_user_middle: - if (text.hasData()) - { - userData->middle.set(text.c_str()); - userData->middle.setEntered(1); - } - else - { - userData->middle.setEntered(0); - userData->middle.setSpecified(1); - } - break; - - case isc_dyn_user_last: - if (text.hasData()) - { - userData->last.set(text.c_str()); - userData->last.setEntered(1); - } - else - { - userData->last.setEntered(0); - userData->last.setSpecified(1); - } - break; - - case isc_dyn_user_admin: - fb_assert(text.hasData()); - userData->adm.set(text[0] - '0'); - userData->adm.setEntered(1); - break; - } - } - - int ddlAction = 0; - - switch (userData->op) - { - case ADD_OPER: - ddlAction = DDL_TRIGGER_CREATE_USER; - break; - - case MOD_OPER: - ddlAction = DDL_TRIGGER_ALTER_USER; - break; - } - - if (ddlAction != 0) - { - DdlNode::executeDdlTrigger(tdbb, gbl->gbl_transaction, DdlNode::DTW_BEFORE, - ddlAction, userData->user.get(), gbl->sqlText); - } - - USHORT id = tra->getUserManagement()->put(userData); - DFW_post_work(tra, dfw_user_management, NULL, id); - - if (ddlAction != 0) - { - DdlNode::executeDdlTrigger(tdbb, gbl->gbl_transaction, DdlNode::DTW_AFTER, - ddlAction, userData->user.get(), gbl->sqlText); - } - } - catch (const Exception& e) - { - e.stuff_exception(status); - memmove(&status[2], &status[0], sizeof(status) - 2 * sizeof(status[0])); - status[0] = isc_arg_gds; - status[1] = isc_no_meta_update; - status_exception::raise(status); - } -} Modified: firebird/trunk/src/msgs/facilities2.sql =================================================================== --- firebird/trunk/src/msgs/facilities2.sql 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/msgs/facilities2.sql 2012-01-08 18:33:59 UTC (rev 53820) @@ -3,35 +3,18 @@ -- ('2011-12-22 18:36:31', 'JRD', 0, 710) ('2010-03-15 06:59:09', 'QLI', 1, 531) --- ---('2008-11-28 20:27:04', 'GDEF', 2, 346) --- ('2009-07-16 05:26:11', 'GFIX', 3, 121) ('1996-11-07 13:39:40', 'GPRE', 4, 1) --- ---('1996-11-07 13:39:40', 'GLTJ', 5, 1) ---('1996-11-07 13:39:40', 'GRST', 6, 1) --- ('2005-11-05 13:09:00', 'DSQL', 7, 32) -('2011-07-15 12:08:00', 'DYN', 8, 283) --- ---('1996-11-07 13:39:40', 'FRED', 9, 1) --- +('2011-07-15 12:08:00', 'DYN', 8, 284) ('1996-11-07 13:39:40', 'INSTALL', 10, 1) ('1996-11-07 13:38:41', 'TEST', 11, 4) ('2011-06-01 12:57:44', 'GBAK', 12, 351) -('2010-11-27 13:05:00', 'SQLERR', 13, 1029) +('2010-11-27 13:05:00', 'SQLERR', 13, 1031) ('1996-11-07 13:38:42', 'SQLWARN', 14, 613) ('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307) --- ---('1996-11-07 13:38:43', 'GJRN', 16, 241) --- ('2009-12-21 04:00:05', 'ISQL', 17, 173) ('2010-07-10 10:50:30', 'GSEC', 18, 105) --- ---('2002-03-05 02:30:12', 'LICENSE', 19, 60) ---('2002-03-05 02:31:54', 'DOS', 20, 74) --- ('2009-12-26 14:22:00', 'GSTAT', 21, 50) ('2009-12-18 19:33:34', 'FBSVCMGR', 22, 57) ('2009-07-18 12:12:12', 'UTL', 23, 2) Modified: firebird/trunk/src/msgs/messages2.sql =================================================================== --- firebird/trunk/src/msgs/messages2.sql 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/msgs/messages2.sql 2012-01-08 18:33:59 UTC (rev 53820) @@ -1858,6 +1858,7 @@ ('dyn_routine_param_ambiguous', 'OnCommentNode::execute', 'DdlNodes.epp', NULL, 8, 280, NULL, 'Parameter @1 of routine @2 is ambiguous (found in both procedures and functions). Use a specifier keyword.', NULL, NULL); ('dyn_coll_used_function', 'DropCollationNode::execute', 'DdlNodes.epp', NULL, 8, 281, NULL, 'Collation @1 is used in function @2 (parameter name @3) and cannot be dropped', NULL, NULL); ('dyn_domain_used_function', 'DropDomainNode', 'DdlNodes.epp', NULL, 8, 282, NULL, 'Domain @1 is used in function @2 (parameter name @3) and cannot be dropped', NULL, NULL); +('dyn_alter_user_no_clause', 'CreateAlterUserNode', 'DdlNodes.epp', NULL, 8, 283, NULL, 'ALTER USER requires at least one clause to be specified', NULL, NULL); COMMIT WORK; -- TEST (NULL, 'main', 'test.c', NULL, 11, 0, NULL, 'This is a modified text message', NULL, NULL); @@ -2497,6 +2498,8 @@ ('dsql_create_shadow_failed', 'getMainErrorCode', 'DdlNodes.h', NULL, 13, 1026, NULL, 'CREATE SHADOW @1 failed', NULL, NULL); ('dsql_create_filter_failed', 'getMainErrorCode', 'DdlNodes.h', NULL, 13, 1027, NULL, 'DECLARE FILTER @1 failed', NULL, NULL); ('dsql_create_index_failed', 'getMainErrorCode', 'DdlNodes.h', NULL, 13, 1028, NULL, 'CREATE INDEX @1 failed', NULL, NULL); +('dsql_create_user_failed', 'getMainErrorCode', 'DdlNodes.h', NULL, 13, 1029, NULL, 'CREATE USER @1 failed', NULL, NULL); +('dsql_alter_user_failed', 'getMainErrorCode', 'DdlNodes.h', NULL, 13, 1030, NULL, 'ALTER USER @1 failed', NULL, NULL); -- SQLWARN (NULL, NULL, NULL, NULL, 14, 100, NULL, 'Row not found for fetch, update or delete, or the result of a query is an empty table.', NULL, NULL); (NULL, NULL, NULL, NULL, 14, 101, NULL, 'segment buffer length shorter than expected', NULL, NULL); Modified: firebird/trunk/src/msgs/system_errors2.sql =================================================================== --- firebird/trunk/src/msgs/system_errors2.sql 2012-01-08 14:05:29 UTC (rev 53819) +++ firebird/trunk/src/msgs/system_errors2.sql 2012-01-08 18:33:59 UTC (rev 53820) @@ -845,6 +845,7 @@ (-901, '42', '000', 8, 280, 'dyn_routine_param_ambiguous', NULL, NULL) (-901, 'HY', '000', 8, 281, 'dyn_coll_used_function', NULL, NULL) (-901, 'HY', '000', 8, 282, 'dyn_domain_used_function', NULL, NULL) +(-901, '42', '000', 8, 283, 'dyn_alter_user_no_clause', NULL, NULL) -- GBAK (-901, '00', '000', 12, 1, 'gbak_unknown_switch', NULL, NULL) (-901, '00', '000', 12, 2, 'gbak_page_size_missing', NULL, NULL) @@ -1060,6 +1061,8 @@ (-901, '42', '000', 13, 1026, 'dsql_create_shadow_failed', NULL, NULL); (-901, '42', '000', 13, 1027, 'dsql_create_filter_failed', NULL, NULL); (-901, '42', '000', 13, 1028, 'dsql_create_index_failed', NULL, NULL); +(-901, '42', '000', 13, 1029, 'dsql_create_user_failed', NULL, NULL); +(-901, '42', '000', 13, 1030, 'dsql_alter_user_failed', NULL, NULL); -- GSEC (-901, '00', '000', 18, 15, 'gsec_cant_open_db', NULL, NULL) (-901, '00', '000', 18, 16, 'gsec_switches_error', NULL, NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2012-01-09 03:23:00
|
Revision: 53824 http://firebird.svn.sourceforge.net/firebird/?rev=53824&view=rev Author: firebirds Date: 2012-01-09 03:22:53 +0000 (Mon, 09 Jan 2012) 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 2012-01-09 00:49:25 UTC (rev 53823) +++ firebird/trunk/ChangeLog 2012-01-09 03:22:53 UTC (rev 53824) @@ -1,3 +1,73 @@ + 2012-01-09 00:49 asfernandes + M src/dsql/parse.y +Misc. + + 2012-01-09 00:08 asfernandes + M src/dsql/PackageNodes.epp + M src/dsql/parse.y + M src/jrd/ini.epp + M src/jrd/met.epp + M src/jrd/met_proto.h +Misc. + + 2012-01-09 00:08 asfernandes + M src/dsql/DdlNodes.epp + M src/dsql/node.h + M src/jrd/irq.h + M src/jrd/vio.cpp +Corrections and cleanup. + + 2012-01-08 18:33 dimitr + M lang_helpers/gds_codes.ftn + M lang_helpers/gds_codes.pas + M src/dsql/DdlNodes.epp + M src/dsql/DdlNodes.h + M src/dsql/ddl.cpp + M src/dsql/node.h + M src/dsql/parse.y + M src/dsql/pass1.cpp + M src/include/gen/codetext.h + M src/include/gen/iberror.h + M src/include/gen/msgs.h + M src/include/gen/sql_code.h + M src/include/gen/sql_state.h + M src/jrd/dyn.epp + M src/msgs/facilities2.sql + M src/msgs/messages2.sql + M src/msgs/system_errors2.sql +Refactored CREATE/ALTER USER. Untested at runtime. + + 2012-01-08 14:05 dimitr + M src/dsql/DdlNodes.epp + M src/dsql/PackageNodes.epp + M src/jrd/cvt2.cpp + M src/jrd/cvt2_proto.h + M src/jrd/drq.h + M src/jrd/dyn.h + M src/jrd/grant.epp + M src/jrd/ini.epp + M src/jrd/ini_proto.h + M src/jrd/irq.h + M src/jrd/met.epp + M src/jrd/met_proto.h + M src/jrd/mov.cpp + M src/jrd/mov_proto.h + M src/jrd/obj.h + M src/jrd/scl.epp + M src/jrd/scl.h + M src/jrd/scl_proto.h + M src/jrd/types.h + M src/jrd/vio.cpp +1) Restricted ALTER/DROP permissions to the object owners only. Now this applies to domains, charsets, collations, generators and exceptions. This fixes CORE-304: Metadata security hole - any user can alter/drop generators and exceptions. +2) Opened the gates to implement the standard USAGE privilege (CORE-2884). SQL support and validation logic are still to be developed. +3) Added the grant option to the owner permissions for packages, procedures and functions. +4) Misc cleanup and refactoring. + + 2012-01-08 09:40 dimitr + M src/jrd/btr.h + M src/jrd/ods.h +Misc. + 2012-01-07 02:30 dimitr M src/jrd/btr.cpp M src/jrd/ods.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-09 00:49:25 UTC (rev 53823) +++ firebird/trunk/src/jrd/build_no.h 2012-01-09 03:22:53 UTC (rev 53824) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29703 + FORMAL BUILD NUMBER:29709 */ -#define PRODUCT_VER_STRING "3.0.0.29703" -#define FILE_VER_STRING "WI-T3.0.0.29703" -#define LICENSE_VER_STRING "WI-T3.0.0.29703" -#define FILE_VER_NUMBER 3, 0, 0, 29703 +#define PRODUCT_VER_STRING "3.0.0.29709" +#define FILE_VER_STRING "WI-T3.0.0.29709" +#define LICENSE_VER_STRING "WI-T3.0.0.29709" +#define FILE_VER_NUMBER 3, 0, 0, 29709 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29703" +#define FB_BUILD_NO "29709" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-09 00:49:25 UTC (rev 53823) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-09 03:22:53 UTC (rev 53824) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29703 +BuildNum=29709 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...> - 2012-01-10 03:21:54
|
Revision: 53830 http://firebird.svn.sourceforge.net/firebird/?rev=53830&view=rev Author: firebirds Date: 2012-01-10 03:21:48 +0000 (Tue, 10 Jan 2012) 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 2012-01-09 09:48:14 UTC (rev 53829) +++ firebird/trunk/ChangeLog 2012-01-10 03:21:48 UTC (rev 53830) @@ -1,3 +1,23 @@ + 2012-01-09 09:48 dimitr + M src/dsql/DdlNodes.epp + M src/dsql/DdlNodes.h + M src/dsql/Nodes.h + M src/dsql/PackageNodes.epp + M src/jrd/drq.h + M src/jrd/dyn.h + M src/jrd/ini.epp +1) Made the functions logic in sync with the procedures one. +2) Simplified the privileges creation code. + + 2012-01-09 08:57 dimitr + M src/jrd/idx.h +More indices to avoid full table scans on system tables (this time during the column modification). + + 2012-01-09 08:41 dimitr + M src/jrd/idx.h +Added a system index that helps to avoid a full table scan on RDB$PROCEDURE_PARAMETERS and RDB$FUNCTION_ARGUMENTS during domain deletion. +Also, simplified the system index definitions and removed the gaps in the ID numbering. + 2012-01-09 00:49 asfernandes M src/dsql/parse.y Misc. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-09 09:48:14 UTC (rev 53829) +++ firebird/trunk/src/jrd/build_no.h 2012-01-10 03:21:48 UTC (rev 53830) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29709 + FORMAL BUILD NUMBER:29712 */ -#define PRODUCT_VER_STRING "3.0.0.29709" -#define FILE_VER_STRING "WI-T3.0.0.29709" -#define LICENSE_VER_STRING "WI-T3.0.0.29709" -#define FILE_VER_NUMBER 3, 0, 0, 29709 +#define PRODUCT_VER_STRING "3.0.0.29712" +#define FILE_VER_STRING "WI-T3.0.0.29712" +#define LICENSE_VER_STRING "WI-T3.0.0.29712" +#define FILE_VER_NUMBER 3, 0, 0, 29712 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29709" +#define FB_BUILD_NO "29712" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-09 09:48:14 UTC (rev 53829) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-10 03:21:48 UTC (rev 53830) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29709 +BuildNum=29712 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...> - 2012-01-11 03:23:35
|
Revision: 53837 http://firebird.svn.sourceforge.net/firebird/?rev=53837&view=rev Author: firebirds Date: 2012-01-11 03:23:28 +0000 (Wed, 11 Jan 2012) 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 2012-01-10 13:53:44 UTC (rev 53836) +++ firebird/trunk/ChangeLog 2012-01-11 03:23:28 UTC (rev 53837) @@ -1,3 +1,11 @@ + 2012-01-10 13:53 asfernandes + M src/jrd/idx.h +Invert the RDB$PACKAGE_NAME segment in system indexes to make them usable in more cases. + + 2012-01-10 13:15 dimitr + M src/jrd/btr.cpp +Slightly different fix for CORE-3722: IS NOT DISTINCT FROM NULL doesn't use index. + 2012-01-09 09:48 dimitr M src/dsql/DdlNodes.epp M src/dsql/DdlNodes.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-10 13:53:44 UTC (rev 53836) +++ firebird/trunk/src/jrd/build_no.h 2012-01-11 03:23:28 UTC (rev 53837) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29712 + FORMAL BUILD NUMBER:29714 */ -#define PRODUCT_VER_STRING "3.0.0.29712" -#define FILE_VER_STRING "WI-T3.0.0.29712" -#define LICENSE_VER_STRING "WI-T3.0.0.29712" -#define FILE_VER_NUMBER 3, 0, 0, 29712 +#define PRODUCT_VER_STRING "3.0.0.29714" +#define FILE_VER_STRING "WI-T3.0.0.29714" +#define LICENSE_VER_STRING "WI-T3.0.0.29714" +#define FILE_VER_NUMBER 3, 0, 0, 29714 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29712" +#define FB_BUILD_NO "29714" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-10 13:53:44 UTC (rev 53836) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-11 03:23:28 UTC (rev 53837) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29712 +BuildNum=29714 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2012-01-11 07:49:03
|
Revision: 53840 http://firebird.svn.sourceforge.net/firebird/?rev=53840&view=rev Author: dimitr Date: 2012-01-11 07:48:52 +0000 (Wed, 11 Jan 2012) Log Message: ----------- Cleanup. Modified Paths: -------------- firebird/trunk/builds/win32/msvc10/engine.vcxproj firebird/trunk/builds/win32/msvc8/engine.vcproj firebird/trunk/builds/win32/msvc9/engine.vcproj Removed Paths: ------------- firebird/trunk/src/jrd/tpc.h Modified: firebird/trunk/builds/win32/msvc10/engine.vcxproj =================================================================== --- firebird/trunk/builds/win32/msvc10/engine.vcxproj 2012-01-11 03:38:57 UTC (rev 53839) +++ firebird/trunk/builds/win32/msvc10/engine.vcxproj 2012-01-11 07:48:52 UTC (rev 53840) @@ -314,7 +314,6 @@ <ClInclude Include="..\..\..\src\jrd\SysFunction.h" /> <ClInclude Include="..\..\..\src\jrd\TempSpace.h" /> <ClInclude Include="..\..\..\src\jrd\thread_proto.h" /> - <ClInclude Include="..\..\..\src\jrd\tpc.h" /> <ClInclude Include="..\..\..\src\jrd\tpc_proto.h" /> <ClInclude Include="..\..\..\src\jrd\tra.h" /> <ClInclude Include="..\..\..\src\jrd\trace\TraceConfigStorage.h" /> Modified: firebird/trunk/builds/win32/msvc8/engine.vcproj =================================================================== --- firebird/trunk/builds/win32/msvc8/engine.vcproj 2012-01-11 03:38:57 UTC (rev 53839) +++ firebird/trunk/builds/win32/msvc8/engine.vcproj 2012-01-11 07:48:52 UTC (rev 53840) @@ -1540,10 +1540,6 @@ > </File> <File - RelativePath="..\..\..\src\jrd\tpc.h" - > - </File> - <File RelativePath="..\..\..\src\jrd\tpc_proto.h" > </File> Modified: firebird/trunk/builds/win32/msvc9/engine.vcproj =================================================================== --- firebird/trunk/builds/win32/msvc9/engine.vcproj 2012-01-11 03:38:57 UTC (rev 53839) +++ firebird/trunk/builds/win32/msvc9/engine.vcproj 2012-01-11 07:48:52 UTC (rev 53840) @@ -1540,10 +1540,6 @@ > </File> <File - RelativePath="..\..\..\src\jrd\tpc.h" - > - </File> - <File RelativePath="..\..\..\src\jrd\tpc_proto.h" > </File> Deleted: firebird/trunk/src/jrd/tpc.h =================================================================== --- firebird/trunk/src/jrd/tpc.h 2012-01-11 03:38:57 UTC (rev 53839) +++ firebird/trunk/src/jrd/tpc.h 2012-01-11 07:48:52 UTC (rev 53840) @@ -1,39 +0,0 @@ -/* - * PROGRAM: JRD Access Method - * MODULE: tpc.h - * DESCRIPTION: Transaction Inventory Page Cache - * - * The contents of this file are subject to the Interbase Public - * License Version 1.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy - * of the License at http://www.Inprise.com/IPL.html - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code was created by Inprise Corporation - * and its predecessors. Portions created by Inprise Corporation are - * Copyright (C) Inprise Corporation. - * - * All Rights Reserved. - * Contributor(s): ______________________________________. - */ - -#ifndef JRD_TPC_H -#define JRD_TPC_H - -namespace Jrd { - -class TxPageCache : public pool_alloc_rpt<SCHAR, type_tpc> -{ -public: - TxPageCache* tpc_next; - SLONG tpc_base; /* id of first transaction in this block */ - UCHAR tpc_transactions[1]; /* two bits per transaction */ -}; - -} //namespace Jrd - -#endif /* JRD_TPC_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2012-01-12 03:22:19
|
Revision: 53848 http://firebird.svn.sourceforge.net/firebird/?rev=53848&view=rev Author: firebirds Date: 2012-01-12 03:22:12 +0000 (Thu, 12 Jan 2012) 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 2012-01-11 13:24:13 UTC (rev 53847) +++ firebird/trunk/ChangeLog 2012-01-12 03:22:12 UTC (rev 53848) @@ -1,3 +1,30 @@ + 2012-01-11 13:24 alexpeshkoff + M src/remote/inet.cpp +Cleanup - use flags parameter of alloc_port() function for async ports + + 2012-01-11 12:56 alexpeshkoff + M builds/posix/Makefile.in +Applied Michal's patch + + 2012-01-11 12:05 alexpeshkoff + M src/remote/server/server.cpp +Misc + + 2012-01-11 07:58 dimitr + M builds/mac_os_x/CS/CS.pbproj/project.pbxproj +Cleanup. + + 2012-01-11 07:51 dimitr + M builds/win32/msvc10/engine.vcxproj.filters +Cleanup. + + 2012-01-11 07:48 dimitr + M builds/win32/msvc10/engine.vcxproj + M builds/win32/msvc8/engine.vcproj + M builds/win32/msvc9/engine.vcproj + D src/jrd/tpc.h +Cleanup. + 2012-01-10 13:53 asfernandes M src/jrd/idx.h Invert the RDB$PACKAGE_NAME segment in system indexes to make them usable in more cases. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-11 13:24:13 UTC (rev 53847) +++ firebird/trunk/src/jrd/build_no.h 2012-01-12 03:22:12 UTC (rev 53848) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29714 + FORMAL BUILD NUMBER:29720 */ -#define PRODUCT_VER_STRING "3.0.0.29714" -#define FILE_VER_STRING "WI-T3.0.0.29714" -#define LICENSE_VER_STRING "WI-T3.0.0.29714" -#define FILE_VER_NUMBER 3, 0, 0, 29714 +#define PRODUCT_VER_STRING "3.0.0.29720" +#define FILE_VER_STRING "WI-T3.0.0.29720" +#define LICENSE_VER_STRING "WI-T3.0.0.29720" +#define FILE_VER_NUMBER 3, 0, 0, 29720 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29714" +#define FB_BUILD_NO "29720" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-11 13:24:13 UTC (rev 53847) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-12 03:22:12 UTC (rev 53848) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29714 +BuildNum=29720 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...> - 2012-01-13 03:23:42
|
Revision: 53855 http://firebird.svn.sourceforge.net/firebird/?rev=53855&view=rev Author: firebirds Date: 2012-01-13 03:23:35 +0000 (Fri, 13 Jan 2012) 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 2012-01-12 15:02:17 UTC (rev 53854) +++ firebird/trunk/ChangeLog 2012-01-13 03:23:35 UTC (rev 53855) @@ -1,3 +1,20 @@ + 2012-01-12 15:00 alexpeshkoff + M builds/posix/Makefile.in.plugins_examples + M builds/posix/make.rules +Fixed CORE-3727: Support C preprocessor flags in firebird build system + + 2012-01-12 14:54 asfernandes + M src/jrd/btr.cpp + M src/jrd/btr_proto.h + M src/jrd/idx.cpp +Fixed (hope!) CORE-1997 - Broken foreign key handling for multi-segmented index using multi-level collations. + + 2012-01-12 13:53 alexpeshkoff + M src/remote/remot_proto.h + M src/remote/remote.cpp + M src/remote/server/server.cpp +Fixed multifactor auth-plugin use on server - thanks to Claudio + 2012-01-11 13:24 alexpeshkoff M src/remote/inet.cpp Cleanup - use flags parameter of alloc_port() function for async ports Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-12 15:02:17 UTC (rev 53854) +++ firebird/trunk/src/jrd/build_no.h 2012-01-13 03:23:35 UTC (rev 53855) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29720 + FORMAL BUILD NUMBER:29723 */ -#define PRODUCT_VER_STRING "3.0.0.29720" -#define FILE_VER_STRING "WI-T3.0.0.29720" -#define LICENSE_VER_STRING "WI-T3.0.0.29720" -#define FILE_VER_NUMBER 3, 0, 0, 29720 +#define PRODUCT_VER_STRING "3.0.0.29723" +#define FILE_VER_STRING "WI-T3.0.0.29723" +#define LICENSE_VER_STRING "WI-T3.0.0.29723" +#define FILE_VER_NUMBER 3, 0, 0, 29723 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29720" +#define FB_BUILD_NO "29723" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-12 15:02:17 UTC (rev 53854) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-13 03:23:35 UTC (rev 53855) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29720 +BuildNum=29723 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...> - 2012-01-14 03:23:59
|
Revision: 53861 http://firebird.svn.sourceforge.net/firebird/?rev=53861&view=rev Author: firebirds Date: 2012-01-14 03:23:52 +0000 (Sat, 14 Jan 2012) 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 2012-01-13 15:58:24 UTC (rev 53860) +++ firebird/trunk/ChangeLog 2012-01-14 03:23:52 UTC (rev 53861) @@ -1,3 +1,17 @@ + 2012-01-13 15:58 alexpeshkoff + M builds/install/misc/firebird.conf.in +cleanup + + 2012-01-13 11:36 alexpeshkoff + M src/include/firebird/Plugin.h +Misc + + 2012-01-13 08:23 alexpeshkoff + M src/dsql/DdlNodes.epp + M src/msgs/facilities2.sql + M src/msgs/messages2.sql +Fixed CORE-3599: Possible drop role RDB$ADMIN + 2012-01-12 15:00 alexpeshkoff M builds/posix/Makefile.in.plugins_examples M builds/posix/make.rules Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-13 15:58:24 UTC (rev 53860) +++ firebird/trunk/src/jrd/build_no.h 2012-01-14 03:23:52 UTC (rev 53861) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29723 + FORMAL BUILD NUMBER:29726 */ -#define PRODUCT_VER_STRING "3.0.0.29723" -#define FILE_VER_STRING "WI-T3.0.0.29723" -#define LICENSE_VER_STRING "WI-T3.0.0.29723" -#define FILE_VER_NUMBER 3, 0, 0, 29723 +#define PRODUCT_VER_STRING "3.0.0.29726" +#define FILE_VER_STRING "WI-T3.0.0.29726" +#define LICENSE_VER_STRING "WI-T3.0.0.29726" +#define FILE_VER_NUMBER 3, 0, 0, 29726 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29723" +#define FB_BUILD_NO "29726" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-13 15:58:24 UTC (rev 53860) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-14 03:23:52 UTC (rev 53861) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29723 +BuildNum=29726 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...> - 2012-01-17 03:20:19
|
Revision: 53868 http://firebird.svn.sourceforge.net/firebird/?rev=53868&view=rev Author: firebirds Date: 2012-01-17 03:20:12 +0000 (Tue, 17 Jan 2012) 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 2012-01-16 20:33:52 UTC (rev 53867) +++ firebird/trunk/ChangeLog 2012-01-17 03:20:12 UTC (rev 53868) @@ -1,3 +1,21 @@ + 2012-01-16 20:33 asfernandes + M src/dsql/DdlNodes.epp + M src/remote/inet.cpp +Misc. + + 2012-01-16 15:01 alexpeshkoff + M src/remote/inet.cpp + M src/remote/protocol.cpp + M src/remote/protocol.h + M src/remote/remote.cpp + M src/remote/remote.h + M src/remote/server/server.cpp +Fixed CORE-3718: Client Library Hangs after unsuccessful connection to remote auxiliary (events) port + + 2012-01-16 14:30 alexpeshkoff + M src/yvalve/why.cpp +Fixed segfault in case of error in queEvents() + 2012-01-13 15:58 alexpeshkoff M builds/install/misc/firebird.conf.in cleanup Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-16 20:33:52 UTC (rev 53867) +++ firebird/trunk/src/jrd/build_no.h 2012-01-17 03:20:12 UTC (rev 53868) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29726 + FORMAL BUILD NUMBER:29729 */ -#define PRODUCT_VER_STRING "3.0.0.29726" -#define FILE_VER_STRING "WI-T3.0.0.29726" -#define LICENSE_VER_STRING "WI-T3.0.0.29726" -#define FILE_VER_NUMBER 3, 0, 0, 29726 +#define PRODUCT_VER_STRING "3.0.0.29729" +#define FILE_VER_STRING "WI-T3.0.0.29729" +#define LICENSE_VER_STRING "WI-T3.0.0.29729" +#define FILE_VER_NUMBER 3, 0, 0, 29729 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29726" +#define FB_BUILD_NO "29729" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-16 20:33:52 UTC (rev 53867) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-17 03:20:12 UTC (rev 53868) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29726 +BuildNum=29729 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...> - 2012-01-18 03:22:07
|
Revision: 53878 http://firebird.svn.sourceforge.net/firebird/?rev=53878&view=rev Author: firebirds Date: 2012-01-18 03:22:00 +0000 (Wed, 18 Jan 2012) 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 2012-01-17 17:25:39 UTC (rev 53877) +++ firebird/trunk/ChangeLog 2012-01-18 03:22:00 UTC (rev 53878) @@ -1,3 +1,35 @@ + 2012-01-17 12:33 robocop + M src/common/classes/MetaName.cpp + M src/common/classes/MetaName.h +Helper method. + + 2012-01-17 12:30 robocop + M builds/win32/msvc9/Firebird3.sln + M builds/win32/msvc9/common.vcproj + M builds/win32/msvc9/fbserver.vcproj + M builds/win32/msvc9/firebird2.vsprops + M builds/win32/msvc9/remote.vcproj + M builds/win32/msvc9/yvalve.vcproj +Update vc9 files. + + 2012-01-17 12:29 robocop + M extern/libtommath/libtommath_MSVC9.sln + M extern/libtommath/libtommath_MSVC9.vcproj +Update vc9 files. + + 2012-01-17 12:23 robocop + M builds/win32/make_boot.bat + M builds/win32/set_build_target.bat +Make always the release version of LibTomMath, as we do with ICU. + + 2012-01-17 10:44 alexpeshkoff + M doc/WhatsNew +misc + + 2012-01-17 10:43 alexpeshkoff + M doc/WhatsNew +In order not to forget removed firebird.conf options + 2012-01-16 20:33 asfernandes M src/dsql/DdlNodes.epp M src/remote/inet.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-17 17:25:39 UTC (rev 53877) +++ firebird/trunk/src/jrd/build_no.h 2012-01-18 03:22:00 UTC (rev 53878) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29729 + FORMAL BUILD NUMBER:29735 */ -#define PRODUCT_VER_STRING "3.0.0.29729" -#define FILE_VER_STRING "WI-T3.0.0.29729" -#define LICENSE_VER_STRING "WI-T3.0.0.29729" -#define FILE_VER_NUMBER 3, 0, 0, 29729 +#define PRODUCT_VER_STRING "3.0.0.29735" +#define FILE_VER_STRING "WI-T3.0.0.29735" +#define LICENSE_VER_STRING "WI-T3.0.0.29735" +#define FILE_VER_NUMBER 3, 0, 0, 29735 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29729" +#define FB_BUILD_NO "29735" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-17 17:25:39 UTC (rev 53877) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-18 03:22:00 UTC (rev 53878) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29729 +BuildNum=29735 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...> - 2012-01-19 03:20:40
|
Revision: 53883 http://firebird.svn.sourceforge.net/firebird/?rev=53883&view=rev Author: firebirds Date: 2012-01-19 03:20:33 +0000 (Thu, 19 Jan 2012) 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 2012-01-18 13:01:59 UTC (rev 53882) +++ firebird/trunk/ChangeLog 2012-01-19 03:20:33 UTC (rev 53883) @@ -1,3 +1,11 @@ + 2012-01-18 13:01 hvlad + A builds/win32/msvc9/srp.vcproj +Project file for VC9, by Claudio + + 2012-01-18 12:03 alexpeshkoff + M src/burp/restore.epp +Fixed CORE-3733: GBAK fails to fix system generators while restoring + 2012-01-17 12:33 robocop M src/common/classes/MetaName.cpp M src/common/classes/MetaName.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2012-01-18 13:01:59 UTC (rev 53882) +++ firebird/trunk/src/jrd/build_no.h 2012-01-19 03:20:33 UTC (rev 53883) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:29735 + FORMAL BUILD NUMBER:29737 */ -#define PRODUCT_VER_STRING "3.0.0.29735" -#define FILE_VER_STRING "WI-T3.0.0.29735" -#define LICENSE_VER_STRING "WI-T3.0.0.29735" -#define FILE_VER_NUMBER 3, 0, 0, 29735 +#define PRODUCT_VER_STRING "3.0.0.29737" +#define FILE_VER_STRING "WI-T3.0.0.29737" +#define LICENSE_VER_STRING "WI-T3.0.0.29737" +#define FILE_VER_NUMBER 3, 0, 0, 29737 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "29735" +#define FB_BUILD_NO "29737" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2012-01-18 13:01:59 UTC (rev 53882) +++ firebird/trunk/src/misc/writeBuildNum.sh 2012-01-19 03:20:33 UTC (rev 53883) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=29735 +BuildNum=29737 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |