Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2016-02-04 00:10:33
|
Revision: 62925
http://sourceforge.net/p/firebird/code/62925
Author: firebirds
Date: 2016-02-04 00:10:30 +0000 (Thu, 04 Feb 2016)
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 2016-02-03 20:16:57 UTC (rev 62924)
+++ firebird/trunk/ChangeLog 2016-02-04 00:10:30 UTC (rev 62925)
@@ -1,3 +1,89 @@
+ 2016-02-03 19:41 hvlad
+ M src/common/classes/FpeControl.h
+Frontport code from v2.5. It should fix CORE-5102 : FB3.0 RC1 Fbclient.dll function calls modify FPU control word
+
+ 2016-02-03 15:22 asfernandes
+ M src/jrd/met.epp
+Fixed CORE-5097 - COMPUTED-BY expressions are not converted to their field type inside the engine.
+
+ 2016-02-03 15:02 paul_reeves
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+Convert install script to UTF-8
+Do not assign name of chosen installation language to BelevedLabel as, at least for the moment non-ascii characters get mangled.
+Disable support for Bosnian at install time (temporarily, I hope.)
+
+ 2016-02-03 14:59 paul_reeves
+ M builds/install/arch-specific/win32/custom_messages.inc
+ M builds/install/arch-specific/win32/i18n_readme.txt
+Convert i18n files to UTF-8 with BOM
+
+ 2016-02-03 14:57 paul_reeves
+ M builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
+ M builds/install/arch-specific/win32/ba/ProcitajMe.txt
+ M builds/install/arch-specific/win32/ba/custom_messages_ba.inc
+ M builds/install/arch-specific/win32/cz/ctime.txt
+ M builds/install/arch-specific/win32/cz/custom_messages_cz.inc
+ M builds/install/arch-specific/win32/cz/instalace_ctime.txt
+ M builds/install/arch-specific/win32/de/custom_messages_de.inc
+ M builds/install/arch-specific/win32/de/installation_liesmich.txt
+ M builds/install/arch-specific/win32/de/liesmich.txt
+ M builds/install/arch-specific/win32/es/custom_messages_es.inc
+ M builds/install/arch-specific/win32/es/leame.txt
+ M builds/install/arch-specific/win32/es/leame_instalacion.txt
+ M builds/install/arch-specific/win32/fr/custom_messages_fr.inc
+ M builds/install/arch-specific/win32/fr/documents-en-francais.txt
+ M builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
+ M builds/install/arch-specific/win32/fr/lisezmoi.txt
+ M builds/install/arch-specific/win32/hu/custom_messages_hu.inc
+ M builds/install/arch-specific/win32/hu/olvass_el.txt
+ M builds/install/arch-specific/win32/hu/telepitesi_segedlet.txt
+ M builds/install/arch-specific/win32/it/custom_messages_it.inc
+ M builds/install/arch-specific/win32/it/leggimi.txt
+ M builds/install/arch-specific/win32/it/leggimi_installazione.txt
+ M builds/install/arch-specific/win32/pl/custom_messages_pl.inc
+ M builds/install/arch-specific/win32/pl/czytajto.txt
+ M builds/install/arch-specific/win32/pl/instalacja_czytajto.txt
+ M builds/install/arch-specific/win32/pt/custom_messages_pt.inc
+ M builds/install/arch-specific/win32/pt/instalacao_leia-me.txt
+ M builds/install/arch-specific/win32/pt/leia-me.txt
+ M builds/install/arch-specific/win32/ru/Readme.txt
+ M builds/install/arch-specific/win32/ru/installation_readme.txt
+ M builds/install/arch-specific/win32/si/custom_messages_si.inc
+ M builds/install/arch-specific/win32/si/instalacija_precitajMe.txt
+Convert i18n files to UTF-8 with BOM
+
+ 2016-02-03 14:15 alexpeshkoff
+ M doc/sql.extensions/README.ddl.txt
+Documented CORE-5100
+
+ 2016-02-03 13:20 alexpeshkoff
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ 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/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+ M src/dsql/parse.y
+ M src/include/firebird/FirebirdInterface.idl
+ M src/include/firebird/IdlFbInterfaces.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/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+ M src/jrd/ods.h
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+ M src/utilities/gstat/ppg.cpp
+Implemented CORE-5100: Improve control over database crypt keys
+
2016-02-02 22:26 hvlad
M src/dsql/StmtNodes.cpp
It should fix bug CORE-5087 : Database shutdown can cause server crash if multiple attachments run EXECUTE STATEMENT
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-03 20:16:57 UTC (rev 62924)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-04 00:10:30 UTC (rev 62925)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32313
+ FORMAL BUILD NUMBER:32320
*/
-#define PRODUCT_VER_STRING "3.0.0.32313"
-#define FILE_VER_STRING "WI-V3.0.0.32313"
-#define LICENSE_VER_STRING "WI-V3.0.0.32313"
-#define FILE_VER_NUMBER 3, 0, 0, 32313
+#define PRODUCT_VER_STRING "3.0.0.32320"
+#define FILE_VER_STRING "WI-V3.0.0.32320"
+#define LICENSE_VER_STRING "WI-V3.0.0.32320"
+#define FILE_VER_NUMBER 3, 0, 0, 32320
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32313"
+#define FB_BUILD_NO "32320"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-03 20:16:57 UTC (rev 62924)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-04 00:10:30 UTC (rev 62925)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32313
+BuildNum=32320
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2016-02-04 09:22:05
|
Revision: 62928
http://sourceforge.net/p/firebird/code/62928
Author: alexpeshkoff
Date: 2016-02-04 09:22:03 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
Postfix for CORE-5100: restored binary compatibility with crypt plugins for RC1
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/src/include/firebird/FirebirdInterface.idl
firebird/trunk/src/include/firebird/IdlFbInterfaces.h
firebird/trunk/src/jrd/CryptoManager.cpp
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2016-02-04 06:47:14 UTC (rev 62927)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2016-02-04 09:22:03 UTC (rev 62928)
@@ -95,8 +95,8 @@
// ICryptPlugin implementation
void encrypt(CheckStatusWrapper* status, unsigned int length, const void* from, void* to);
void decrypt(CheckStatusWrapper* status, unsigned int length, const void* from, void* to);
- void setKey(CheckStatusWrapper* status, const char* keyName,
- unsigned int length, IKeyHolderPlugin** sources);
+ void setKey(CheckStatusWrapper* status, unsigned int length, IKeyHolderPlugin** sources,
+ const char* keyName);
int release()
{
@@ -197,8 +197,8 @@
}
}
-void DbCrypt::setKey(CheckStatusWrapper* status, const char* keyName,
- unsigned int length, IKeyHolderPlugin** sources)
+void DbCrypt::setKey(CheckStatusWrapper* status, unsigned int length, IKeyHolderPlugin** sources,
+ const char* keyName)
{
status->init();
Modified: firebird/trunk/src/include/firebird/FirebirdInterface.idl
===================================================================
--- firebird/trunk/src/include/firebird/FirebirdInterface.idl 2016-02-04 06:47:14 UTC (rev 62927)
+++ firebird/trunk/src/include/firebird/FirebirdInterface.idl 2016-02-04 09:22:03 UTC (rev 62928)
@@ -724,7 +724,7 @@
// It's supposed that crypt plugin will invoke keyHandle() function from them
// to access callback interface for getting actual crypt key.
// If crypt plugin fails to find appropriate key in sources, it should raise error.
- void setKey(Status status, const string keyName, uint length, KeyHolderPlugin* sources);
+ void setKey(Status status, uint length, KeyHolderPlugin* sources, const string keyName);
void encrypt(Status status, uint length, const void* from, void* to);
void decrypt(Status status, uint length, const void* from, void* to);
}
Modified: firebird/trunk/src/include/firebird/IdlFbInterfaces.h
===================================================================
--- firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2016-02-04 06:47:14 UTC (rev 62927)
+++ firebird/trunk/src/include/firebird/IdlFbInterfaces.h 2016-02-04 09:22:03 UTC (rev 62928)
@@ -2871,7 +2871,7 @@
public:
struct VTable : public IPluginBase::VTable
{
- void (CLOOP_CARG *setKey)(IDbCryptPlugin* self, IStatus* status, const char* keyName, unsigned length, IKeyHolderPlugin** sources) throw();
+ void (CLOOP_CARG *setKey)(IDbCryptPlugin* self, IStatus* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName) throw();
void (CLOOP_CARG *encrypt)(IDbCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) throw();
void (CLOOP_CARG *decrypt)(IDbCryptPlugin* self, IStatus* status, unsigned length, const void* from, void* to) throw();
};
@@ -2889,10 +2889,10 @@
public:
static const unsigned VERSION = 4;
- template <typename StatusType> void setKey(StatusType* status, const char* keyName, unsigned length, IKeyHolderPlugin** sources)
+ template <typename StatusType> void setKey(StatusType* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName)
{
StatusType::clearException(status);
- static_cast<VTable*>(this->cloopVTable)->setKey(this, status, keyName, length, sources);
+ static_cast<VTable*>(this->cloopVTable)->setKey(this, status, length, sources, keyName);
StatusType::checkException(status);
}
@@ -11093,13 +11093,13 @@
this->cloopVTable = &vTable;
}
- static void CLOOP_CARG cloopsetKeyDispatcher(IDbCryptPlugin* self, IStatus* status, const char* keyName, unsigned length, IKeyHolderPlugin** sources) throw()
+ static void CLOOP_CARG cloopsetKeyDispatcher(IDbCryptPlugin* self, IStatus* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName) throw()
{
StatusType status2(status);
try
{
- static_cast<Name*>(self)->Name::setKey(&status2, keyName, length, sources);
+ static_cast<Name*>(self)->Name::setKey(&status2, length, sources, keyName);
}
catch (...)
{
@@ -11199,7 +11199,7 @@
{
}
- virtual void setKey(StatusType* status, const char* keyName, unsigned length, IKeyHolderPlugin** sources) = 0;
+ virtual void setKey(StatusType* status, unsigned length, IKeyHolderPlugin** sources, const char* keyName) = 0;
virtual void encrypt(StatusType* status, unsigned length, const void* from, void* to) = 0;
virtual void decrypt(StatusType* status, unsigned length, const void* from, void* to) = 0;
};
Modified: firebird/trunk/src/jrd/CryptoManager.cpp
===================================================================
--- firebird/trunk/src/jrd/CryptoManager.cpp 2016-02-04 06:47:14 UTC (rev 62927)
+++ firebird/trunk/src/jrd/CryptoManager.cpp 2016-02-04 09:22:03 UTC (rev 62928)
@@ -1071,7 +1071,7 @@
}
FbLocalStatus st;
- crypt->setKey(&st, keyName, length, vector);
+ crypt->setKey(&st, length, vector, keyName);
st.check();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-02-05 00:09:21
|
Revision: 62933
http://sourceforge.net/p/firebird/code/62933
Author: firebirds
Date: 2016-02-05 00:09:18 +0000 (Fri, 05 Feb 2016)
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 2016-02-04 17:14:53 UTC (rev 62932)
+++ firebird/trunk/ChangeLog 2016-02-05 00:09:18 UTC (rev 62933)
@@ -1,3 +1,19 @@
+ 2016-02-04 14:28 asfernandes
+ M src/dsql/ExprNodes.cpp
+ M src/jrd/met.epp
+Move the code and add the CAST only when required, per Dmitry comment.
+
+ 2016-02-04 10:33 hvlad
+ M src/jrd/cch.cpp
+Fixed bug CORE-5101 : Backup restore is slow in FB3 when the database contains many small tables with indices
+
+ 2016-02-04 09:22 alexpeshkoff
+ M examples/dbcrypt/DbCrypt.cpp
+ M src/include/firebird/FirebirdInterface.idl
+ M src/include/firebird/IdlFbInterfaces.h
+ M src/jrd/CryptoManager.cpp
+Postfix for CORE-5100: restored binary compatibility with crypt plugins for RC1
+
2016-02-03 19:41 hvlad
M src/common/classes/FpeControl.h
Frontport code from v2.5. It should fix CORE-5102 : FB3.0 RC1 Fbclient.dll function calls modify FPU control word
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-04 17:14:53 UTC (rev 62932)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-05 00:09:18 UTC (rev 62933)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32320
+ FORMAL BUILD NUMBER:32323
*/
-#define PRODUCT_VER_STRING "3.0.0.32320"
-#define FILE_VER_STRING "WI-V3.0.0.32320"
-#define LICENSE_VER_STRING "WI-V3.0.0.32320"
-#define FILE_VER_NUMBER 3, 0, 0, 32320
+#define PRODUCT_VER_STRING "3.0.0.32323"
+#define FILE_VER_STRING "WI-V3.0.0.32323"
+#define LICENSE_VER_STRING "WI-V3.0.0.32323"
+#define FILE_VER_NUMBER 3, 0, 0, 32323
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32320"
+#define FB_BUILD_NO "32323"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-04 17:14:53 UTC (rev 62932)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-05 00:09:18 UTC (rev 62933)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32320
+BuildNum=32323
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...> - 2016-02-06 00:09:09
|
Revision: 62940
http://sourceforge.net/p/firebird/code/62940
Author: firebirds
Date: 2016-02-06 00:09:07 +0000 (Sat, 06 Feb 2016)
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 2016-02-05 15:21:58 UTC (rev 62939)
+++ firebird/trunk/ChangeLog 2016-02-06 00:09:07 UTC (rev 62940)
@@ -1,3 +1,31 @@
+ 2016-02-05 15:21 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+ M src/jrd/Database.h
+ M src/jrd/jrd.cpp
+Fixed CORE-5105: Deadlocks when database is initially encrypted
+
+ 2016-02-05 15:13 alexpeshkoff
+ M src/jrd/cch.cpp
+ M src/jrd/cch_proto.h
+ M src/jrd/sdw.cpp
+Postfix for CORE-5100: avoid races caused by temporary changed bdb_buffer
+
+ 2016-02-05 15:09 hvlad
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/IscDS.cpp
+Missed piece for CORE-5104, thanks to Alex again
+
+ 2016-02-05 15:05 hvlad
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/IscDS.cpp
+Fixed bug CORE-5104 : External data source selects became slow
+Thanks to Alex
+
+ 2016-02-05 11:00 dimitr
+ M src/dsql/ExprNodes.cpp
+Postfix to address the regression found in the recent commit for CORE-5097.
+
2016-02-04 14:28 asfernandes
M src/dsql/ExprNodes.cpp
M src/jrd/met.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-05 15:21:58 UTC (rev 62939)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-06 00:09:07 UTC (rev 62940)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32323
+ FORMAL BUILD NUMBER:32328
*/
-#define PRODUCT_VER_STRING "3.0.0.32323"
-#define FILE_VER_STRING "WI-V3.0.0.32323"
-#define LICENSE_VER_STRING "WI-V3.0.0.32323"
-#define FILE_VER_NUMBER 3, 0, 0, 32323
+#define PRODUCT_VER_STRING "3.0.0.32328"
+#define FILE_VER_STRING "WI-V3.0.0.32328"
+#define LICENSE_VER_STRING "WI-V3.0.0.32328"
+#define FILE_VER_NUMBER 3, 0, 0, 32328
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32323"
+#define FB_BUILD_NO "32328"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-05 15:21:58 UTC (rev 62939)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-06 00:09:07 UTC (rev 62940)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32323
+BuildNum=32328
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...> - 2016-02-07 00:09:15
|
Revision: 62944
http://sourceforge.net/p/firebird/code/62944
Author: firebirds
Date: 2016-02-07 00:09:13 +0000 (Sun, 07 Feb 2016)
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 2016-02-06 07:39:38 UTC (rev 62943)
+++ firebird/trunk/ChangeLog 2016-02-07 00:09:13 UTC (rev 62944)
@@ -1,3 +1,7 @@
+ 2016-02-06 07:37 dimitr
+ M doc/WhatsNew
+Updated the docs for RC2.
+
2016-02-05 15:21 alexpeshkoff
M src/jrd/CryptoManager.cpp
M src/jrd/CryptoManager.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-06 07:39:38 UTC (rev 62943)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-07 00:09:13 UTC (rev 62944)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32328
+ FORMAL BUILD NUMBER:32329
*/
-#define PRODUCT_VER_STRING "3.0.0.32328"
-#define FILE_VER_STRING "WI-V3.0.0.32328"
-#define LICENSE_VER_STRING "WI-V3.0.0.32328"
-#define FILE_VER_NUMBER 3, 0, 0, 32328
+#define PRODUCT_VER_STRING "3.0.0.32329"
+#define FILE_VER_STRING "WI-V3.0.0.32329"
+#define LICENSE_VER_STRING "WI-V3.0.0.32329"
+#define FILE_VER_NUMBER 3, 0, 0, 32329
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32328"
+#define FB_BUILD_NO "32329"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-06 07:39:38 UTC (rev 62943)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-07 00:09:13 UTC (rev 62944)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32328
+BuildNum=32329
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...> - 2016-02-08 00:08:50
|
Revision: 62947
http://sourceforge.net/p/firebird/code/62947
Author: firebirds
Date: 2016-02-08 00:08:48 +0000 (Mon, 08 Feb 2016)
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 2016-02-07 11:48:58 UTC (rev 62946)
+++ firebird/trunk/ChangeLog 2016-02-08 00:08:48 UTC (rev 62947)
@@ -1,3 +1,7 @@
+ 2016-02-07 07:44 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+Postfix for CORE-5100, thanks to Dmitry Sibiryakov
+
2016-02-06 07:37 dimitr
M doc/WhatsNew
Updated the docs for RC2.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-07 11:48:58 UTC (rev 62946)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-08 00:08:48 UTC (rev 62947)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32329
+ FORMAL BUILD NUMBER:32330
*/
-#define PRODUCT_VER_STRING "3.0.0.32329"
-#define FILE_VER_STRING "WI-V3.0.0.32329"
-#define LICENSE_VER_STRING "WI-V3.0.0.32329"
-#define FILE_VER_NUMBER 3, 0, 0, 32329
+#define PRODUCT_VER_STRING "3.0.0.32330"
+#define FILE_VER_STRING "WI-V3.0.0.32330"
+#define LICENSE_VER_STRING "WI-V3.0.0.32330"
+#define FILE_VER_NUMBER 3, 0, 0, 32330
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32329"
+#define FB_BUILD_NO "32330"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-07 11:48:58 UTC (rev 62946)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-08 00:08:48 UTC (rev 62947)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32329
+BuildNum=32330
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...> - 2016-02-11 00:09:01
|
Revision: 62958
http://sourceforge.net/p/firebird/code/62958
Author: firebirds
Date: 2016-02-11 00:08:59 +0000 (Thu, 11 Feb 2016)
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 2016-02-10 18:57:43 UTC (rev 62957)
+++ firebird/trunk/ChangeLog 2016-02-11 00:08:59 UTC (rev 62958)
@@ -1,3 +1,15 @@
+ 2016-02-10 17:53 asfernandes
+ M src/jrd/dfw.epp
+Fixed CORE-5107 - set autoddl off and sequence of: ( create view V as select * from T; alter view V as select 1 x from rdb$database; drop view V; ) leads to server crash.
+
+ 2016-02-10 14:25 paul_reeves
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+ M builds/install/arch-specific/win32/Readme.txt
+ M builds/install/arch-specific/win32/custom_messages.inc
+ M builds/install/arch-specific/win32/i18n_readme.txt
+ M builds/install/arch-specific/win32/installation_readme.txt
+Miscellaneous changes to prepare windows installer for RC2
+
2016-02-07 07:44 alexpeshkoff
M src/jrd/CryptoManager.cpp
Postfix for CORE-5100, thanks to Dmitry Sibiryakov
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-10 18:57:43 UTC (rev 62957)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-11 00:08:59 UTC (rev 62958)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32330
+ FORMAL BUILD NUMBER:32332
*/
-#define PRODUCT_VER_STRING "3.0.0.32330"
-#define FILE_VER_STRING "WI-V3.0.0.32330"
-#define LICENSE_VER_STRING "WI-V3.0.0.32330"
-#define FILE_VER_NUMBER 3, 0, 0, 32330
+#define PRODUCT_VER_STRING "3.0.0.32332"
+#define FILE_VER_STRING "WI-V3.0.0.32332"
+#define LICENSE_VER_STRING "WI-V3.0.0.32332"
+#define FILE_VER_NUMBER 3, 0, 0, 32332
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32330"
+#define FB_BUILD_NO "32332"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-10 18:57:43 UTC (rev 62957)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-11 00:08:59 UTC (rev 62958)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32330
+BuildNum=32332
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...> - 2016-02-12 00:09:36
|
Revision: 62961
http://sourceforge.net/p/firebird/code/62961
Author: firebirds
Date: 2016-02-12 00:09:34 +0000 (Fri, 12 Feb 2016)
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 2016-02-11 18:10:53 UTC (rev 62960)
+++ firebird/trunk/ChangeLog 2016-02-12 00:09:34 UTC (rev 62961)
@@ -1,3 +1,7 @@
+ 2016-02-11 18:10 asfernandes
+ M src/dsql/DdlNodes.epp
+Fixed CORE-2923 - Problem with dependencies with views.
+
2016-02-10 17:53 asfernandes
M src/jrd/dfw.epp
Fixed CORE-5107 - set autoddl off and sequence of: ( create view V as select * from T; alter view V as select 1 x from rdb$database; drop view V; ) leads to server crash.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-11 18:10:53 UTC (rev 62960)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-12 00:09:34 UTC (rev 62961)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32332
+ FORMAL BUILD NUMBER:32333
*/
-#define PRODUCT_VER_STRING "3.0.0.32332"
-#define FILE_VER_STRING "WI-V3.0.0.32332"
-#define LICENSE_VER_STRING "WI-V3.0.0.32332"
-#define FILE_VER_NUMBER 3, 0, 0, 32332
+#define PRODUCT_VER_STRING "3.0.0.32333"
+#define FILE_VER_STRING "WI-V3.0.0.32333"
+#define LICENSE_VER_STRING "WI-V3.0.0.32333"
+#define FILE_VER_NUMBER 3, 0, 0, 32333
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32332"
+#define FB_BUILD_NO "32333"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-11 18:10:53 UTC (rev 62960)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-12 00:09:34 UTC (rev 62961)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32332
+BuildNum=32333
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...> - 2016-02-13 00:09:50
|
Revision: 62966
http://sourceforge.net/p/firebird/code/62966
Author: firebirds
Date: 2016-02-13 00:09:48 +0000 (Sat, 13 Feb 2016)
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 2016-02-12 13:13:11 UTC (rev 62965)
+++ firebird/trunk/ChangeLog 2016-02-13 00:09:48 UTC (rev 62966)
@@ -1,3 +1,7 @@
+ 2016-02-12 13:13 hvlad
+ M src/jrd/vio.cpp
+Simplest fix for bug CORE-5110 : False PK\FK violation could be reported when attachment used isc_dpb_no_garbage_collect flag
+
2016-02-11 18:10 asfernandes
M src/dsql/DdlNodes.epp
Fixed CORE-2923 - Problem with dependencies with views.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-12 13:13:11 UTC (rev 62965)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-13 00:09:48 UTC (rev 62966)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32333
+ FORMAL BUILD NUMBER:32334
*/
-#define PRODUCT_VER_STRING "3.0.0.32333"
-#define FILE_VER_STRING "WI-V3.0.0.32333"
-#define LICENSE_VER_STRING "WI-V3.0.0.32333"
-#define FILE_VER_NUMBER 3, 0, 0, 32333
+#define PRODUCT_VER_STRING "3.0.0.32334"
+#define FILE_VER_STRING "WI-V3.0.0.32334"
+#define LICENSE_VER_STRING "WI-V3.0.0.32334"
+#define FILE_VER_NUMBER 3, 0, 0, 32334
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32333"
+#define FB_BUILD_NO "32334"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-12 13:13:11 UTC (rev 62965)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-13 00:09:48 UTC (rev 62966)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32333
+BuildNum=32334
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2016-02-14 13:10:26
|
Revision: 62968
http://sourceforge.net/p/firebird/code/62968
Author: aafemt
Date: 2016-02-14 13:10:23 +0000 (Sun, 14 Feb 2016)
Log Message:
-----------
Messages for CORE-5112
Modified Paths:
--------------
firebird/trunk/builds/win32/create_msgs.bat
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
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/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/builds/win32/create_msgs.bat
===================================================================
--- firebird/trunk/builds/win32/create_msgs.bat 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/builds/win32/create_msgs.bat 2016-02-14 13:10:23 UTC (rev 62968)
@@ -9,7 +9,7 @@
@if exist "%FB_GEN_DIR%\dbs\msg.fdb" del "%FB_GEN_DIR%\dbs\msg.fdb"
@echo create database '%FB_GEN_DB_DIR%/dbs/msg.fdb'; | "%FB_BIN_DIR%\isql" -q
-@set FB_MSG_ISQL=@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/msg.fdb -i %FB_ROOT_PATH%\src\msgs\
+@set FB_MSG_ISQL=@"%FB_BIN_DIR%\isql" -b -q %FB_GEN_DB_DIR%/dbs/msg.fdb -i %FB_ROOT_PATH%\src\msgs\
@%FB_MSG_ISQL%msg.sql
@echo.
@echo loading facilities
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2016-02-14 13:10:23 UTC (rev 62968)
@@ -1746,6 +1746,18 @@
PARAMETER (GDS__dsql_db_trigger_type_cant_change = 336003103)
INTEGER*4 GDS__dsql_record_version_table
PARAMETER (GDS__dsql_record_version_table = 336003104)
+ INTEGER*4 GDS__dsql_invalid_sqlda_version
+ PARAMETER (GDS__dsql_invalid_sqlda_version = 336003105)
+ INTEGER*4 GDS__dsql_sqlvar_index
+ PARAMETER (GDS__dsql_sqlvar_index = 336003106)
+ INTEGER*4 GDS__dsql_no_sqlind
+ PARAMETER (GDS__dsql_no_sqlind = 336003107)
+ INTEGER*4 GDS__dsql_no_sqldata
+ PARAMETER (GDS__dsql_no_sqldata = 336003108)
+ INTEGER*4 GDS__dsql_no_input_sqlda
+ PARAMETER (GDS__dsql_no_input_sqlda = 336003109)
+ INTEGER*4 GDS__dsql_no_output_sqlda
+ PARAMETER (GDS__dsql_no_output_sqlda = 336003110)
INTEGER*4 GDS__dyn_filter_not_found
PARAMETER (GDS__dyn_filter_not_found = 336068645)
INTEGER*4 GDS__dyn_func_not_found
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2016-02-14 13:10:23 UTC (rev 62968)
@@ -1741,6 +1741,18 @@
gds_dsql_db_trigger_type_cant_change = 336003103;
isc_dsql_record_version_table = 336003104;
gds_dsql_record_version_table = 336003104;
+ isc_dsql_invalid_sqlda_version = 336003105;
+ gds_dsql_invalid_sqlda_version = 336003105;
+ isc_dsql_sqlvar_index = 336003106;
+ gds_dsql_sqlvar_index = 336003106;
+ isc_dsql_no_sqlind = 336003107;
+ gds_dsql_no_sqlind = 336003107;
+ isc_dsql_no_sqldata = 336003108;
+ gds_dsql_no_sqldata = 336003108;
+ isc_dsql_no_input_sqlda = 336003109;
+ gds_dsql_no_input_sqlda = 336003109;
+ isc_dsql_no_output_sqlda = 336003110;
+ gds_dsql_no_output_sqlda = 336003110;
isc_dyn_filter_not_found = 336068645;
gds_dyn_filter_not_found = 336068645;
isc_dyn_func_not_found = 336068649;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/codetext.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -869,6 +869,12 @@
{"dsql_incompatible_trigger_type", 336003102},
{"dsql_db_trigger_type_cant_change", 336003103},
{"dsql_record_version_table", 336003104},
+ {"dsql_invalid_sqlda_version", 336003105},
+ {"dsql_sqlvar_index", 336003106},
+ {"dsql_no_sqlind", 336003107},
+ {"dsql_no_sqldata", 336003108},
+ {"dsql_no_input_sqlda", 336003109},
+ {"dsql_no_output_sqlda", 336003110},
{"dyn_filter_not_found", 336068645},
{"dyn_func_not_found", 336068649},
{"dyn_index_not_found", 336068656},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/iberror.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -903,6 +903,12 @@
const ISC_STATUS isc_dsql_incompatible_trigger_type = 336003102L;
const ISC_STATUS isc_dsql_db_trigger_type_cant_change = 336003103L;
const ISC_STATUS isc_dsql_record_version_table = 336003104L;
+const ISC_STATUS isc_dsql_invalid_sqlda_version = 336003105L;
+const ISC_STATUS isc_dsql_sqlvar_index = 336003106L;
+const ISC_STATUS isc_dsql_no_sqlind = 336003107L;
+const ISC_STATUS isc_dsql_no_sqldata = 336003108L;
+const ISC_STATUS isc_dsql_no_input_sqlda = 336003109L;
+const ISC_STATUS isc_dsql_no_output_sqlda = 336003110L;
const ISC_STATUS isc_dyn_filter_not_found = 336068645L;
const ISC_STATUS isc_dyn_func_not_found = 336068649L;
const ISC_STATUS isc_dyn_index_not_found = 336068656L;
@@ -1308,7 +1314,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 = 1252;
+const ISC_STATUS isc_err_max = 1258;
#else /* c definitions */
@@ -2181,6 +2187,12 @@
#define isc_dsql_incompatible_trigger_type 336003102L
#define isc_dsql_db_trigger_type_cant_change 336003103L
#define isc_dsql_record_version_table 336003104L
+#define isc_dsql_invalid_sqlda_version 336003105L
+#define isc_dsql_sqlvar_index 336003106L
+#define isc_dsql_no_sqlind 336003107L
+#define isc_dsql_no_sqldata 336003108L
+#define isc_dsql_no_input_sqlda 336003109L
+#define isc_dsql_no_output_sqlda 336003110L
#define isc_dyn_filter_not_found 336068645L
#define isc_dyn_func_not_found 336068649L
#define isc_dyn_index_not_found 336068656L
@@ -2586,7 +2598,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 1252
+#define isc_err_max 1258
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/msgs.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -284,7 +284,7 @@
{335544580, "Table unknown"}, /* dsql_relation_err */
{335544581, "Procedure unknown"}, /* dsql_procedure_err */
{335544582, "Request unknown"}, /* dsql_request_err */
- {335544583, "SQLDA missing or incorrect version, or incorrect number/type of variables"}, /* dsql_sqlda_err */
+ {335544583, "SQLDA error"}, /* dsql_sqlda_err */
{335544584, "Count of read-write columns does not equal count of values"}, /* dsql_var_count_err */
{335544585, "Invalid statement handle"}, /* dsql_stmt_handle */
{335544586, "Function unknown"}, /* dsql_function_err */
@@ -872,6 +872,12 @@
{336003102, "Incompatible trigger type"}, /* dsql_incompatible_trigger_type */
{336003103, "Database trigger type can't be changed"}, /* dsql_db_trigger_type_cant_change */
{336003104, "To be used with RDB$RECORD_VERSION, @1 must be a table or a view of single table"}, /* dsql_record_version_table */
+ {336003105, "SQLDA version expected between @1 and @2, found @3"}, /* dsql_invalid_sqlda_version */
+ {336003106, "at SQLVAR index @1"}, /* dsql_sqlvar_index */
+ {336003107, "empty pointer to NULL indicator variable"}, /* dsql_no_sqlind */
+ {336003108, "empty pointer to data"}, /* dsql_no_sqldata */
+ {336003109, "No SQLDA for input values provided"}, /* dsql_no_input_sqlda */
+ {336003110, "No SQLDA for output values provided"}, /* dsql_no_output_sqlda */
{336068645, "BLOB Filter @1 not found"}, /* dyn_filter_not_found */
{336068649, "Function @1 not found"}, /* dyn_func_not_found */
{336068656, "Index not found"}, /* dyn_index_not_found */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/sql_code.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -868,6 +868,12 @@
{336003102, -817}, /* 30 dsql_incompatible_trigger_type */
{336003103, -817}, /* 31 dsql_db_trigger_type_cant_change */
{336003104, -607}, /* 32 dsql_record_version_table */
+ {336003105, -802}, /* 33 dsql_invalid_sqlda_version */
+ {336003106, -802}, /* 34 dsql_sqlvar_index */
+ {336003107, -802}, /* 35 dsql_no_sqlind */
+ {336003108, -802}, /* 36 dsql_no_sqldata */
+ {336003109, -802}, /* 37 dsql_no_input_sqlda */
+ {336003110, -802}, /* 38 dsql_no_output_sqlda */
{336068645, -901}, /* 37 dyn_filter_not_found */
{336068649, -901}, /* 41 dyn_func_not_found */
{336068656, -901}, /* 48 dyn_index_not_found */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/include/gen/sql_state.h 2016-02-14 13:10:23 UTC (rev 62968)
@@ -868,6 +868,12 @@
{336003102, "42000"}, // 30 dsql_incompatible_trigger_type
{336003103, "42000"}, // 31 dsql_db_trigger_type_cant_change
{336003104, "HY000"}, // 32 dsql_record_version_table
+ {336003105, "07002"}, // 33 dsql_invalid_sqlda_version
+ {336003106, "07002"}, // 34 dsql_sqlvar_index
+ {336003107, "07002"}, // 35 dsql_no_sqlind
+ {336003108, "07002"}, // 36 dsql_no_sqldata
+ {336003109, "07002"}, // 37 dsql_no_input_sqlda
+ {336003110, "07002"}, // 38 dsql_no_output_sqlda
{336068645, "42000"}, // 37 dyn_filter_not_found
{336068649, "42000"}, // 41 dyn_func_not_found
{336068656, "42000"}, // 48 dyn_index_not_found
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/msgs/facilities2.sql 2016-02-14 13:10:23 UTC (rev 62968)
@@ -5,7 +5,7 @@
('2015-03-17 18:33:00', 'QLI', 1, 533)
('2015-01-07 18:01:51', 'GFIX', 3, 134)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
-('2012-08-27 21:26:00', 'DSQL', 7, 33)
+('2012-08-27 21:26:00', 'DSQL', 7, 39)
('2015-10-07 12:30:00', 'DYN', 8, 291)
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/msgs/messages2.sql 2016-02-14 13:10:23 UTC (rev 62968)
@@ -359,7 +359,7 @@
('dsql_relation_err', 'PASS1_make_context', 'dsql pass1.c', NULL, 0, 260, NULL, 'Table unknown', NULL, NULL);
('dsql_procedure_err', 'PASS1_statement', 'dsql pass1.c', NULL, 0, 261, NULL, 'Procedure unknown', NULL, NULL);
('dsql_request_err', 'lookup_stmt', 'dsql user_dsql.c', NULL, 0, 262, NULL, 'Request unknown', NULL, NULL);
-('dsql_sqlda_err', '(several)', 'dsql (several)', NULL, 0, 263, NULL, 'SQLDA missing or incorrect version, or incorrect number/type of variables', NULL, NULL);
+('dsql_sqlda_err', '(several)', 'dsql (several)', NULL, 0, 263, NULL, 'SQLDA error', NULL, NULL);
('dsql_var_count_err', 'pass1_insert', 'dsql pass1.c', NULL, 0, 264, NULL, 'Count of read-write columns does not equal count of values', NULL, NULL);
('dsql_stmt_handle', 'bad_sql_handle', 'whyb.c', NULL, 0, 265, NULL, 'Invalid statement handle', NULL, NULL);
('dsql_function_err', 'pass1_udf', 'dsql pass1.c', NULL, 0, 266, NULL, 'Function unknown', NULL, NULL);
@@ -1675,6 +1675,12 @@
('dsql_incompatible_trigger_type', 'define_trigger', 'ddl.cpp', NULL, 7, 30, NULL, 'Incompatible trigger type', NULL, NULL);
('dsql_db_trigger_type_cant_change', 'define_trigger', 'ddl.cpp', NULL, 7, 31, NULL, 'Database trigger type can''t be changed', NULL, NULL);
('dsql_record_version_table', 'MAKE_desc', 'ExprNodes.cpp', NULL, 7, 32, NULL, 'To be used with RDB$RECORD_VERSION, @1 must be a table or a view of single table', NULL, NULL);
+('dsql_invalid_sqlda_version', NULL, 'why.cpp', NULL, 7, 33, NULL, 'SQLDA version expected between @1 and @2, found @3', NULL, NULL);
+('dsql_sqlvar_index', NULL, 'why.cpp', NULL, 7, 34, NULL, 'at SQLVAR index @1', NULL, NULL);
+('dsql_no_sqlind', NULL, 'why.cpp', NULL, 7, 35, NULL, 'empty pointer to NULL indicator variable', NULL, NULL);
+('dsql_no_sqldata', NULL, 'why.cpp', NULL, 7, 36, NULL, 'empty pointer to data', NULL, NULL);
+('dsql_no_input_sqlda', NULL, NULL, NULL, 7, 37, NULL, 'No SQLDA for input values provided', NULL, NULL);
+('dsql_no_output_sqlda', NULL, NULL, NULL, 7, 38, NULL, 'No SQLDA for output values provided', NULL, NULL);
-- Do not change the arguments of the previous DSQL messages.
-- Write the new DSQL messages here.
-- DYN
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/msgs/system_errors2.sql 2016-02-14 13:10:23 UTC (rev 62968)
@@ -856,6 +856,12 @@
(-817, '42', '000', 7, 30, 'dsql_incompatible_trigger_type', NULL, NULL)
(-817, '42', '000', 7, 31, 'dsql_db_trigger_type_cant_change', NULL, NULL)
(-607, 'HY', '000', 7, 32, 'dsql_record_version_table', NULL, NULL)
+(-802, '07', '002', 7, 33, 'dsql_invalid_sqlda_version', NULL, NULL)
+(-802, '07', '002', 7, 34, 'dsql_sqlvar_index', NULL, NULL)
+(-802, '07', '002', 7, 35, 'dsql_no_sqlind', NULL, NULL)
+(-802, '07', '002', 7, 36, 'dsql_no_sqldata', NULL, NULL)
+(-802, '07', '002', 7, 37, 'dsql_no_input_sqlda', NULL, NULL)
+(-802, '07', '002', 7, 38, 'dsql_no_output_sqlda', NULL, NULL)
-- DYN
(-901, '42', '000', 8, 37, 'dyn_filter_not_found', NULL, NULL)
(-901, '42', '000', 8, 41, 'dyn_func_not_found', NULL, NULL)
Modified: firebird/trunk/src/yvalve/why.cpp
===================================================================
--- firebird/trunk/src/yvalve/why.cpp 2016-02-13 00:14:13 UTC (rev 62967)
+++ firebird/trunk/src/yvalve/why.cpp 2016-02-14 13:10:23 UTC (rev 62968)
@@ -84,7 +84,7 @@
static bool isNetworkError(const IStatus* status);
static void nullCheck(const FB_API_HANDLE* ptr, ISC_STATUS code);
//static void saveErrorString(ISC_STATUS* status);
-static void error804(ISC_STATUS err);
+static void badSqldaVersion(const short version);
static void sqldaDescribeParameters(XSQLDA* sqlda, IMessageMetadata* parameters);
static ISC_STATUS openOrCreateBlob(ISC_STATUS* userStatus, FB_API_HANDLE* dbHandle,
FB_API_HANDLE* traHandle, FB_API_HANDLE* blobHandle, ISC_QUAD* blobId,
@@ -226,10 +226,7 @@
{
if (sqlda && sqlda->version != SQLDA_VERSION1)
{
- (Arg::Gds(isc_dsql_sqlda_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "Invalid SQLDA version"
- ).raise();
+ badSqldaVersion(sqlda->version);
}
}
@@ -506,9 +503,8 @@
if (!var.sqlind)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to NULL indicator variable" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqlind) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -521,9 +517,8 @@
if (!var.sqldata && !*nullInd && (var.sqltype & ~1) != SQL_NULL)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to data" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqldata) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -558,9 +553,8 @@
if (!var.sqldata)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to data" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqldata) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -576,9 +570,8 @@
if (!var.sqlind)
{
(Arg::Gds(isc_dsql_sqlda_value_err) <<
- Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_random) << "empty pointer to NULL indicator variable" <<
- Arg::Gds(isc_index_name) << Arg::Num(i) // To be replaced later with proper message
+ Arg::Gds(isc_dsql_no_sqlind) <<
+ Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(i)
).raise();
}
@@ -1443,12 +1436,12 @@
badHandle(code);
}
-// Raises a DSQL -804 error message.
-static void error804(ISC_STATUS err)
+static void badSqldaVersion(const short version)
{
- status_exception::raise(
- Arg::Gds(isc_dsql_error) << Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(err));
+ (Arg::Gds(isc_dsql_sqlda_value_err) <<
+ Arg::Gds(isc_dsql_invalid_sqlda_version) <<
+ Arg::Num(SQLDA_VERSION1) << Arg::Num(SQLDA_VERSION1) << Arg::Num(version)
+ ).raise();
}
// Set charset info in SQLVAR according to legacy rules
@@ -1473,7 +1466,7 @@
return;
if (sqlda->version != SQLDA_VERSION1)
- error804(isc_dsql_sqlda_err);
+ badSqldaVersion(sqlda->version);
StatusVector status(NULL);
CheckStatusWrapper statusWrapper(&status);
@@ -2516,7 +2509,7 @@
try
{
if (!sqlda)
- status_exception::raise(Arg::Gds(isc_dsql_sqlda_err) << Arg::Gds(isc_random) << "No output SQLDA for fetch");
+ status_exception::raise(Arg::Gds(isc_dsql_sqlda_err) << Arg::Gds(isc_dsql_no_output_sqlda));
RefPtr<IscStatement> statement(translateHandle(statements, stmtHandle));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-02-15 00:09:32
|
Revision: 62969
http://sourceforge.net/p/firebird/code/62969
Author: firebirds
Date: 2016-02-15 00:09:30 +0000 (Mon, 15 Feb 2016)
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 2016-02-14 13:10:23 UTC (rev 62968)
+++ firebird/trunk/ChangeLog 2016-02-15 00:09:30 UTC (rev 62969)
@@ -1,3 +1,18 @@
+ 2016-02-14 13:10 aafemt
+ M builds/win32/create_msgs.bat
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ 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/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+ M src/yvalve/why.cpp
+Messages for CORE-5112
+
2016-02-12 13:13 hvlad
M src/jrd/vio.cpp
Simplest fix for bug CORE-5110 : False PK\FK violation could be reported when attachment used isc_dpb_no_garbage_collect flag
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-14 13:10:23 UTC (rev 62968)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-15 00:09:30 UTC (rev 62969)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32334
+ FORMAL BUILD NUMBER:32335
*/
-#define PRODUCT_VER_STRING "3.0.0.32334"
-#define FILE_VER_STRING "WI-V3.0.0.32334"
-#define LICENSE_VER_STRING "WI-V3.0.0.32334"
-#define FILE_VER_NUMBER 3, 0, 0, 32334
+#define PRODUCT_VER_STRING "3.0.0.32335"
+#define FILE_VER_STRING "WI-V3.0.0.32335"
+#define LICENSE_VER_STRING "WI-V3.0.0.32335"
+#define FILE_VER_NUMBER 3, 0, 0, 32335
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32334"
+#define FB_BUILD_NO "32335"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-14 13:10:23 UTC (rev 62968)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-15 00:09:30 UTC (rev 62969)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32334
+BuildNum=32335
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...> - 2016-02-15 02:53:26
|
Revision: 62971
http://sourceforge.net/p/firebird/code/62971
Author: asfernandes
Date: 2016-02-15 02:53:24 +0000 (Mon, 15 Feb 2016)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/examples/dbcrypt/DbCrypt.cpp
firebird/trunk/src/dsql/parse.y
firebird/trunk/src/jrd/CryptoManager.cpp
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/extds/InternalDS.cpp
firebird/trunk/src/jrd/extds/IscDS.cpp
firebird/trunk/src/jrd/nbak.cpp
firebird/trunk/src/jrd/sdw.cpp
firebird/trunk/src/jrd/vio.cpp
Modified: firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2016-02-15 02:53:24 UTC (rev 62971)
@@ -111,7 +111,7 @@
o Libraries deployed by instclient may fail to load if
the MS runtime libraries have not been installed.
This may be a problem if installing on older Windows
- platforms.
+ platforms.
Uninstallation
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -164,7 +164,7 @@
class NamedCallback : public ICryptKeyCallbackImpl<NamedCallback, CheckStatusWrapper>
{
public:
- NamedCallback(NamedCallback *n, const char* nm, UCHAR k)
+ NamedCallback(NamedCallback* n, const char* nm, UCHAR k)
: next(n), key(k)
{
strncpy(name, nm, sizeof(name));
Modified: firebird/trunk/examples/dbcrypt/DbCrypt.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/examples/dbcrypt/DbCrypt.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -154,7 +154,7 @@
vector[0] = isc_arg_gds;
vector[1] = isc_random;
vector[2] = isc_arg_string;
- vector[3] = (ISC_STATUS)msg;
+ vector[3] = (ISC_STATUS) msg;
vector[4] = isc_arg_end;
status->setErrors(vector);
}
@@ -205,7 +205,7 @@
if (key != 0)
return;
- strncpy(savedKeyName, keyName ? keyName : "", sizeof(savedKeyName));
+ strncpy(savedKeyName, (keyName ? keyName : ""), sizeof(savedKeyName));
savedKeyName[sizeof(savedKeyName) - 1] = 0;
IConfig* def = config->getDefaultConfig(status);
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/dsql/parse.y 2016-02-15 02:53:24 UTC (rev 62971)
@@ -3480,7 +3480,7 @@
{ $$ = Nullable<bool>::val(true); }
| INACTIVE
{ $$ = Nullable<bool>::val(false); }
- |
+ | // nothing
{ $$ = Nullable<bool>::empty(); }
;
@@ -3976,9 +3976,8 @@
%type crypt_key_clause(<alterDatabaseNode>)
crypt_key_clause($alterDatabaseNode)
- : /* nothing */
- | KEY valid_symbol_name
- { $alterDatabaseNode->keyName = *$2; }
+ : // nothing
+ | KEY valid_symbol_name { $alterDatabaseNode->keyName = *$2; }
;
// ALTER TRIGGER
Modified: firebird/trunk/src/jrd/CryptoManager.cpp
===================================================================
--- firebird/trunk/src/jrd/CryptoManager.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/CryptoManager.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -416,7 +416,7 @@
if (sv->getState() & IStatus::STATE_ERRORS)
Arg::StatusVector(&sv).raise();
- // calculate it's hash
+ // calculate its hash
const string verifier(result, sizeof(result));
Sha1::hashBased64(valid, verifier);
}
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/cch.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -4892,7 +4892,7 @@
bool callback(thread_db* tdbb, FbStatusVector* status, Ods::pag* page)
{
- Database *dbb = tdbb->getDatabase();
+ Database* dbb = tdbb->getDatabase();
while (!PIO_write(tdbb, file, bdb, page, status))
{
@@ -4925,7 +4925,7 @@
Pio io(pageSpace->file, bdb, inAst, isTempPage, pageSpace);
result = dbb->dbb_crypto_manager->write(tdbb, status, page, &io);
- if ((!result) && (bdb->bdb_flags & BDB_io_error))
+ if (!result && (bdb->bdb_flags & BDB_io_error))
{
return false;
}
Modified: firebird/trunk/src/jrd/extds/InternalDS.cpp
===================================================================
--- firebird/trunk/src/jrd/extds/InternalDS.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/extds/InternalDS.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -160,7 +160,7 @@
m_dbName = dbb->dbb_database_name.c_str();
generateDPB(tdbb, m_dpb, user, pwd, role);
- // Avoid change of m_dpb by validatePassword() below
+ // Avoid change of m_dpb by validatePassword() below
ClumpletWriter newDpb(m_dpb);
validatePassword(tdbb, m_dbName, newDpb);
Modified: firebird/trunk/src/jrd/extds/IscDS.cpp
===================================================================
--- firebird/trunk/src/jrd/extds/IscDS.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/extds/IscDS.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -117,7 +117,7 @@
m_dbName = dbName;
generateDPB(tdbb, m_dpb, user, pwd, role);
- // Avoid change of m_dpb by validatePassword() below
+ // Avoid change of m_dpb by validatePassword() below
ClumpletWriter newDpb(m_dpb);
validatePassword(tdbb, m_dbName, newDpb);
Modified: firebird/trunk/src/jrd/nbak.cpp
===================================================================
--- firebird/trunk/src/jrd/nbak.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/nbak.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -822,10 +822,12 @@
{
return PIO_write(tdbb, file, bdb, page, sv);
}
+
private:
jrd_file* file;
BufferDesc* bdb;
};
+
Pio io(diff_file, &temp_bdb);
if (!database->dbb_crypto_manager->write(tdbb, status, page, &io))
@@ -850,10 +852,12 @@
{
return PIO_read(tdbb, file, bdb, page, sv);
}
+
private:
jrd_file* file;
BufferDesc* bdb;
};
+
Pio io(diff_file, &temp_bdb);
if (!database->dbb_crypto_manager->read(tdbb, tdbb->tdbb_status_vector, page, &io))
Modified: firebird/trunk/src/jrd/sdw.cpp
===================================================================
--- firebird/trunk/src/jrd/sdw.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/sdw.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -514,10 +514,11 @@
Shadow* shadow;
BufferDesc* bdb;
};
+
Pio cryptIo(shadow, window.win_bdb);
if (!dbb->dbb_crypto_manager->write(tdbb, tdbb->tdbb_status_vector,
- window.win_bdb->bdb_buffer, &cryptIo))
+ window.win_bdb->bdb_buffer, &cryptIo))
{
CCH_RELEASE(tdbb, &window);
ERR_punt();
Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp 2016-02-15 02:53:05 UTC (rev 62970)
+++ firebird/trunk/src/jrd/vio.cpp 2016-02-15 02:53:24 UTC (rev 62971)
@@ -2266,7 +2266,7 @@
case tra_committed:
return !(rpb->rpb_flags & rpb_deleted);
case tra_dead:
- // Run backout else false key violation could be reported, see CORE-5110
+ // Run backout otherwise false key violation could be reported, see CORE-5110
//
// if (transaction->tra_attachment->att_flags & ATT_no_cleanup)
// return !foreign_key;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-02-16 00:09:51
|
Revision: 62977
http://sourceforge.net/p/firebird/code/62977
Author: firebirds
Date: 2016-02-16 00:09:49 +0000 (Tue, 16 Feb 2016)
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 2016-02-15 05:02:42 UTC (rev 62976)
+++ firebird/trunk/ChangeLog 2016-02-16 00:09:49 UTC (rev 62977)
@@ -1,3 +1,21 @@
+ 2016-02-15 02:53 asfernandes
+ M builds/install/arch-specific/win32/installation_readme.txt
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M src/dsql/parse.y
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/cch.cpp
+ M src/jrd/extds/InternalDS.cpp
+ M src/jrd/extds/IscDS.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/sdw.cpp
+ M src/jrd/vio.cpp
+Misc.
+
+ 2016-02-15 02:53 asfernandes
+ M src/msgs/facilities2.sql
+Correction.
+
2016-02-14 13:10 aafemt
M builds/win32/create_msgs.bat
M lang_helpers/gds_codes.ftn
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-15 05:02:42 UTC (rev 62976)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-16 00:09:49 UTC (rev 62977)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32335
+ FORMAL BUILD NUMBER:32337
*/
-#define PRODUCT_VER_STRING "3.0.0.32335"
-#define FILE_VER_STRING "WI-V3.0.0.32335"
-#define LICENSE_VER_STRING "WI-V3.0.0.32335"
-#define FILE_VER_NUMBER 3, 0, 0, 32335
+#define PRODUCT_VER_STRING "3.0.0.32337"
+#define FILE_VER_STRING "WI-V3.0.0.32337"
+#define LICENSE_VER_STRING "WI-V3.0.0.32337"
+#define FILE_VER_NUMBER 3, 0, 0, 32337
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32335"
+#define FB_BUILD_NO "32337"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-15 05:02:42 UTC (rev 62976)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-16 00:09:49 UTC (rev 62977)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32335
+BuildNum=32337
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...> - 2016-02-17 00:08:55
|
Revision: 62979
http://sourceforge.net/p/firebird/code/62979
Author: firebirds
Date: 2016-02-17 00:08:52 +0000 (Wed, 17 Feb 2016)
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 2016-02-16 13:47:10 UTC (rev 62978)
+++ firebird/trunk/ChangeLog 2016-02-17 00:08:52 UTC (rev 62979)
@@ -1,3 +1,9 @@
+ 2016-02-16 13:47 makowski
+ M builds/install/arch-specific/win32/fr/custom_messages_fr.inc
+ M builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
+ M builds/install/arch-specific/win32/fr/lisezmoi.txt
+update French files for Windows install
+
2016-02-15 02:53 asfernandes
M builds/install/arch-specific/win32/installation_readme.txt
M examples/dbcrypt/CryptKeyHolder.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-16 13:47:10 UTC (rev 62978)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-17 00:08:52 UTC (rev 62979)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32337
+ FORMAL BUILD NUMBER:32338
*/
-#define PRODUCT_VER_STRING "3.0.0.32337"
-#define FILE_VER_STRING "WI-V3.0.0.32337"
-#define LICENSE_VER_STRING "WI-V3.0.0.32337"
-#define FILE_VER_NUMBER 3, 0, 0, 32337
+#define PRODUCT_VER_STRING "3.0.0.32338"
+#define FILE_VER_STRING "WI-V3.0.0.32338"
+#define LICENSE_VER_STRING "WI-V3.0.0.32338"
+#define FILE_VER_NUMBER 3, 0, 0, 32338
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32337"
+#define FB_BUILD_NO "32338"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-16 13:47:10 UTC (rev 62978)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-17 00:08:52 UTC (rev 62979)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32337
+BuildNum=32338
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...> - 2016-02-18 00:08:35
|
Revision: 62985
http://sourceforge.net/p/firebird/code/62985
Author: firebirds
Date: 2016-02-18 00:08:33 +0000 (Thu, 18 Feb 2016)
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 2016-02-17 09:21:09 UTC (rev 62984)
+++ firebird/trunk/ChangeLog 2016-02-18 00:08:33 UTC (rev 62985)
@@ -1,3 +1,19 @@
+ 2016-02-17 09:21 hvlad
+ M src/jrd/jrd.cpp
+ M src/jrd/tpc.cpp
+ M src/jrd/tpc_proto.h
+ M src/jrd/tra.cpp
+ M src/jrd/tra_proto.h
+Front ported for CORE-5067 : Blocking new connections as a consequence of the too long sweep security2.fdb
+
+ 2016-02-17 01:36 asfernandes
+ M src/isql/show.epp
+Fixed the problem I inserted in a review.
+
+ 2016-02-17 01:36 asfernandes
+ M src/isql/show.epp
+Fixed output of SHOW PROCEDURES/FUNCTIONS.
+
2016-02-16 13:47 makowski
M builds/install/arch-specific/win32/fr/custom_messages_fr.inc
M builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-17 09:21:09 UTC (rev 62984)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-18 00:08:33 UTC (rev 62985)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32338
+ FORMAL BUILD NUMBER:32341
*/
-#define PRODUCT_VER_STRING "3.0.0.32338"
-#define FILE_VER_STRING "WI-V3.0.0.32338"
-#define LICENSE_VER_STRING "WI-V3.0.0.32338"
-#define FILE_VER_NUMBER 3, 0, 0, 32338
+#define PRODUCT_VER_STRING "3.0.0.32341"
+#define FILE_VER_STRING "WI-V3.0.0.32341"
+#define LICENSE_VER_STRING "WI-V3.0.0.32341"
+#define FILE_VER_NUMBER 3, 0, 0, 32341
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32338"
+#define FB_BUILD_NO "32341"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-17 09:21:09 UTC (rev 62984)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-18 00:08:33 UTC (rev 62985)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32338
+BuildNum=32341
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...> - 2016-02-19 00:09:08
|
Revision: 62987
http://sourceforge.net/p/firebird/code/62987
Author: firebirds
Date: 2016-02-19 00:09:06 +0000 (Fri, 19 Feb 2016)
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 2016-02-18 14:52:04 UTC (rev 62986)
+++ firebird/trunk/ChangeLog 2016-02-19 00:09:06 UTC (rev 62987)
@@ -1,3 +1,8 @@
+ 2016-02-18 14:52 asfernandes
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+Fixed regression with CORE-1839 after fix for CORE-5097.
+
2016-02-17 09:21 hvlad
M src/jrd/jrd.cpp
M src/jrd/tpc.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-18 14:52:04 UTC (rev 62986)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-19 00:09:06 UTC (rev 62987)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32341
+ FORMAL BUILD NUMBER:32342
*/
-#define PRODUCT_VER_STRING "3.0.0.32341"
-#define FILE_VER_STRING "WI-V3.0.0.32341"
-#define LICENSE_VER_STRING "WI-V3.0.0.32341"
-#define FILE_VER_NUMBER 3, 0, 0, 32341
+#define PRODUCT_VER_STRING "3.0.0.32342"
+#define FILE_VER_STRING "WI-V3.0.0.32342"
+#define LICENSE_VER_STRING "WI-V3.0.0.32342"
+#define FILE_VER_NUMBER 3, 0, 0, 32342
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32341"
+#define FB_BUILD_NO "32342"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-18 14:52:04 UTC (rev 62986)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-19 00:09:06 UTC (rev 62987)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32341
+BuildNum=32342
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...> - 2016-02-20 00:11:27
|
Revision: 62990
http://sourceforge.net/p/firebird/code/62990
Author: firebirds
Date: 2016-02-20 00:11:24 +0000 (Sat, 20 Feb 2016)
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 2016-02-19 16:27:14 UTC (rev 62989)
+++ firebird/trunk/ChangeLog 2016-02-20 00:11:24 UTC (rev 62990)
@@ -1,3 +1,7 @@
+ 2016-02-19 10:39 alexpeshkoff
+ M examples/dbcrypt/CryptKeyHolder.cpp
+Fixed bug in a sample - thanks to Adriano
+
2016-02-18 14:52 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 2016-02-19 16:27:14 UTC (rev 62989)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-20 00:11:24 UTC (rev 62990)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32342
+ FORMAL BUILD NUMBER:32343
*/
-#define PRODUCT_VER_STRING "3.0.0.32342"
-#define FILE_VER_STRING "WI-V3.0.0.32342"
-#define LICENSE_VER_STRING "WI-V3.0.0.32342"
-#define FILE_VER_NUMBER 3, 0, 0, 32342
+#define PRODUCT_VER_STRING "3.0.0.32343"
+#define FILE_VER_STRING "WI-V3.0.0.32343"
+#define LICENSE_VER_STRING "WI-V3.0.0.32343"
+#define FILE_VER_NUMBER 3, 0, 0, 32343
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32342"
+#define FB_BUILD_NO "32343"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-19 16:27:14 UTC (rev 62989)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-20 00:11:24 UTC (rev 62990)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32342
+BuildNum=32343
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2016-02-20 15:34:22
|
Revision: 62991
http://sourceforge.net/p/firebird/code/62991
Author: aafemt
Date: 2016-02-20 15:34:20 +0000 (Sat, 20 Feb 2016)
Log Message:
-----------
Use autoconfig_msvc.h from where it is
Modified Paths:
--------------
firebird/trunk/builds/win32/clean_all.bat
firebird/trunk/builds/win32/make_boot.bat
firebird/trunk/src/gpre/languages/fbrmclib.cpp
firebird/trunk/src/include/firebird.h
Modified: firebird/trunk/builds/win32/clean_all.bat
===================================================================
--- firebird/trunk/builds/win32/clean_all.bat 2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/builds/win32/clean_all.bat 2016-02-20 15:34:20 UTC (rev 62991)
@@ -44,7 +44,7 @@
if defined FB_CLEAN_SHARED (
@echo Cleaning shared gen and dsql files...
-@del %FB_ROOT_PATH%\src\include\gen\autoconfig.h 2>nul
+@del %FB_ROOT_PATH%\src\include\gen\parse.h 2>nul
@del %FB_ROOT_PATH%\src\dsql\dsql.tab.h 2>nul
@del %FB_ROOT_PATH%\src\dsql\parse.cpp 2>nul
)
Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat 2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/builds/win32/make_boot.bat 2016-02-20 15:34:20 UTC (rev 62991)
@@ -17,10 +17,6 @@
::===========
:MAIN
@echo.
-@echo Copy autoconfig.h
-@del %FB_ROOT_PATH%\src\include\gen\autoconfig.h 2> nul
-@copy %FB_ROOT_PATH%\src\include\gen\autoconfig_msvc.h %FB_ROOT_PATH%\src\include\gen\autoconfig.h > nul
-
@echo Creating directories
@rmdir /s /q %FB_GEN_DIR% 2>nul
:: Remove previously generated output, and recreate the directory hierarchy.
Modified: firebird/trunk/src/gpre/languages/fbrmclib.cpp
===================================================================
--- firebird/trunk/src/gpre/languages/fbrmclib.cpp 2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/src/gpre/languages/fbrmclib.cpp 2016-02-20 15:34:20 UTC (rev 62991)
@@ -40,7 +40,11 @@
#include <math.h>
#include <crtdbg.h>
+#ifdef _MSC_VER
+#include "autoconfig_msvc.h"
+#else
#include "autoconfig.h"
+#endif
#include "fb_types.h"
#include "../jrd/ibase.h"
Modified: firebird/trunk/src/include/firebird.h
===================================================================
--- firebird/trunk/src/include/firebird.h 2016-02-20 00:11:24 UTC (rev 62990)
+++ firebird/trunk/src/include/firebird.h 2016-02-20 15:34:20 UTC (rev 62991)
@@ -32,7 +32,11 @@
#ifndef INCLUDE_Firebird_H
#define INCLUDE_Firebird_H
+#ifdef _MSC_VER
+#include "gen/autoconfig_msvc.h"
+#else
#include "gen/autoconfig.h"
+#endif
// Using our debugging code is pointless when we may use Valgrind features
#if defined(DEV_BUILD) && !defined(USE_VALGRIND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-02-21 00:08:38
|
Revision: 62992
http://sourceforge.net/p/firebird/code/62992
Author: firebirds
Date: 2016-02-21 00:08:36 +0000 (Sun, 21 Feb 2016)
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 2016-02-20 15:34:20 UTC (rev 62991)
+++ firebird/trunk/ChangeLog 2016-02-21 00:08:36 UTC (rev 62992)
@@ -1,3 +1,10 @@
+ 2016-02-20 15:34 aafemt
+ M builds/win32/clean_all.bat
+ M builds/win32/make_boot.bat
+ M src/gpre/languages/fbrmclib.cpp
+ M src/include/firebird.h
+Use autoconfig_msvc.h from where it is
+
2016-02-19 10:39 alexpeshkoff
M examples/dbcrypt/CryptKeyHolder.cpp
Fixed bug in a sample - thanks to Adriano
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-20 15:34:20 UTC (rev 62991)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-21 00:08:36 UTC (rev 62992)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32343
+ FORMAL BUILD NUMBER:32344
*/
-#define PRODUCT_VER_STRING "3.0.0.32343"
-#define FILE_VER_STRING "WI-V3.0.0.32343"
-#define LICENSE_VER_STRING "WI-V3.0.0.32343"
-#define FILE_VER_NUMBER 3, 0, 0, 32343
+#define PRODUCT_VER_STRING "3.0.0.32344"
+#define FILE_VER_STRING "WI-V3.0.0.32344"
+#define LICENSE_VER_STRING "WI-V3.0.0.32344"
+#define FILE_VER_NUMBER 3, 0, 0, 32344
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32343"
+#define FB_BUILD_NO "32344"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-20 15:34:20 UTC (rev 62991)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-21 00:08:36 UTC (rev 62992)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32343
+BuildNum=32344
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...> - 2016-02-22 00:08:56
|
Revision: 62997
http://sourceforge.net/p/firebird/code/62997
Author: firebirds
Date: 2016-02-22 00:08:54 +0000 (Mon, 22 Feb 2016)
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 2016-02-21 09:03:12 UTC (rev 62996)
+++ firebird/trunk/ChangeLog 2016-02-22 00:08:54 UTC (rev 62997)
@@ -1,3 +1,11 @@
+ 2016-02-21 09:02 dimitr
+ M src/jrd/Optimizer.cpp
+Fixed the comment.
+
+ 2016-02-21 08:54 dimitr
+ M src/jrd/Optimizer.cpp
+Corrected my old commit re. optimization of the system requests.
+
2016-02-20 15:34 aafemt
M builds/win32/clean_all.bat
M builds/win32/make_boot.bat
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-21 09:03:12 UTC (rev 62996)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-22 00:08:54 UTC (rev 62997)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32344
+ FORMAL BUILD NUMBER:32346
*/
-#define PRODUCT_VER_STRING "3.0.0.32344"
-#define FILE_VER_STRING "WI-V3.0.0.32344"
-#define LICENSE_VER_STRING "WI-V3.0.0.32344"
-#define FILE_VER_NUMBER 3, 0, 0, 32344
+#define PRODUCT_VER_STRING "3.0.0.32346"
+#define FILE_VER_STRING "WI-V3.0.0.32346"
+#define LICENSE_VER_STRING "WI-V3.0.0.32346"
+#define FILE_VER_NUMBER 3, 0, 0, 32346
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32344"
+#define FB_BUILD_NO "32346"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-21 09:03:12 UTC (rev 62996)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-22 00:08:54 UTC (rev 62997)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32344
+BuildNum=32346
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...> - 2016-02-23 00:09:13
|
Revision: 63002
http://sourceforge.net/p/firebird/code/63002
Author: firebirds
Date: 2016-02-23 00:09:11 +0000 (Tue, 23 Feb 2016)
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 2016-02-22 16:20:30 UTC (rev 63001)
+++ firebird/trunk/ChangeLog 2016-02-23 00:09:11 UTC (rev 63002)
@@ -1,3 +1,20 @@
+ 2016-02-22 16:20 paul_reeves
+ M builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
+ M builds/install/arch-specific/win32/ba/ProcitajMe.txt
+ M builds/install/arch-specific/win32/ba/custom_messages_ba.inc
+Add Bosnian i18n files for the Windows binary installer.
+With thanks to Fikret Hasovic
+
+ 2016-02-22 08:27 dimitr
+ M builds/install/arch-specific/win32/installation_readme.txt
+Misc adjustments.
+
+ 2016-02-22 08:19 dimitr
+ M builds/install/arch-specific/win32/ru/Readme.txt
+ M builds/install/arch-specific/win32/ru/custom_messages_ru.inc
+ M builds/install/arch-specific/win32/ru/installation_readme.txt
+Russian translation for the Windows installer.
+
2016-02-21 09:02 dimitr
M src/jrd/Optimizer.cpp
Fixed the comment.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-22 16:20:30 UTC (rev 63001)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-23 00:09:11 UTC (rev 63002)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32346
+ FORMAL BUILD NUMBER:32349
*/
-#define PRODUCT_VER_STRING "3.0.0.32346"
-#define FILE_VER_STRING "WI-V3.0.0.32346"
-#define LICENSE_VER_STRING "WI-V3.0.0.32346"
-#define FILE_VER_NUMBER 3, 0, 0, 32346
+#define PRODUCT_VER_STRING "3.0.0.32349"
+#define FILE_VER_STRING "WI-V3.0.0.32349"
+#define LICENSE_VER_STRING "WI-V3.0.0.32349"
+#define FILE_VER_NUMBER 3, 0, 0, 32349
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32346"
+#define FB_BUILD_NO "32349"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-22 16:20:30 UTC (rev 63001)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-23 00:09:11 UTC (rev 63002)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32346
+BuildNum=32349
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2016-02-23 16:18:40
|
Revision: 63007
http://sourceforge.net/p/firebird/code/63007
Author: aafemt
Date: 2016-02-23 16:18:38 +0000 (Tue, 23 Feb 2016)
Log Message:
-----------
Some more cases of CORE-5112 as pointed by Dmitry Yemanov
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/dsql/dsql.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/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 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2016-02-23 16:18:38 UTC (rev 63007)
@@ -1758,6 +1758,8 @@
PARAMETER (GDS__dsql_no_input_sqlda = 336003109)
INTEGER*4 GDS__dsql_no_output_sqlda
PARAMETER (GDS__dsql_no_output_sqlda = 336003110)
+ INTEGER*4 GDS__dsql_wrong_param_num
+ PARAMETER (GDS__dsql_wrong_param_num = 336003111)
INTEGER*4 GDS__dyn_filter_not_found
PARAMETER (GDS__dyn_filter_not_found = 336068645)
INTEGER*4 GDS__dyn_func_not_found
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2016-02-23 16:18:38 UTC (rev 63007)
@@ -1753,6 +1753,8 @@
gds_dsql_no_input_sqlda = 336003109;
isc_dsql_no_output_sqlda = 336003110;
gds_dsql_no_output_sqlda = 336003110;
+ isc_dsql_wrong_param_num = 336003111;
+ gds_dsql_wrong_param_num = 336003111;
isc_dyn_filter_not_found = 336068645;
gds_dyn_filter_not_found = 336068645;
isc_dyn_func_not_found = 336068649;
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/dsql/dsql.cpp 2016-02-23 16:18:38 UTC (rev 63007)
@@ -997,17 +997,23 @@
// Sanity check
- if (count && !(toExternal ? dsql_msg_buf : in_dsql_msg_buf))
+ if (count)
{
- ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_dsql_sqlda_err)
-#ifdef DEV_BUILD
- << Arg::Gds(isc_random) << "Missing message data buffer"
-#endif
- );
+ if (toExternal)
+ {
+ if (dsql_msg_buf == NULL)
+ {
+ ERRD_post(Arg::Gds(isc_dsql_no_output_sqlda));
+ }
+ }
+ else
+ if (in_dsql_msg_buf == NULL)
+ {
+ ERRD_post(Arg::Gds(isc_dsql_no_input_sqlda));
+ }
}
- bool err = false;
+ USHORT count2 = 0;
for (FB_SIZE_T i = 0; i < message->msg_parameters.getCount(); ++i)
{
@@ -1022,11 +1028,18 @@
desc.clear();
//ULONG length = (IPTR) desc.dsc_address + desc.dsc_length;
-
- if (/*length > msg_length || */!desc.dsc_dtype)
+ //if (length > msg_length)
+ //{
+ // ERRD_post(Arg::Gds(isc_dsql_sqlda_err)
+ // << Arg::Gds(isc_random) << "Message buffer too short"
+ // );
+ //}
+ if (!desc.dsc_dtype)
{
- err = true;
- break;
+ ERRD_post(Arg::Gds(isc_dsql_sqlda_err)
+ << Arg::Gds(isc_dsql_datatype_err)
+ << Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(parameter->par_index-1)
+ );
}
UCHAR* msgBuffer = request->req_msg_buffers[parameter->par_message->msg_buffer_number];
@@ -1045,8 +1058,9 @@
length = null_offset + sizeof(SSHORT);
if (length > msg_length)
{
- err = true;
- break;
+ ERRD_post(Arg::Gds(isc_dsql_sqlda_err)
+ << Arg::Gds(isc_random) << "Message buffer too short"
+ );
}
*/
@@ -1089,20 +1103,14 @@
else
memset(parDesc.dsc_address, 0, parDesc.dsc_length);
- count--;
+ ++count2;
}
}
- // If we got here because the loop was exited early or if part of the
- // message given to us hasn't been used, complain.
-
- if (err || count)
+ if (count != count2)
{
- ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_dsql_sqlda_err)
-#ifdef DEV_BUILD
- << Arg::Gds(isc_random) << (err ? "Message buffer too short" : "Wrong number of message parameters")
-#endif
+ ERRD_post(Arg::Gds(isc_dsql_sqlda_err) <<
+ Arg::Gds(isc_dsql_wrong_param_num) << Arg::Num(count) <<Arg::Num(count2)
);
}
@@ -1210,13 +1218,11 @@
unsigned count = meta->getCount(&st);
checkD(&st);
- if (count != parameters.getCount())
+ unsigned count2 = parameters.getCount();
+ if (count != count2)
{
- ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-804) <<
- Arg::Gds(isc_dsql_sqlda_err)
-#ifdef DEV_BUILD
- << Arg::Gds(isc_random) << "Wrong number of message parameters"
-#endif
+ ERRD_post(Arg::Gds(isc_dsql_sqlda_err) <<
+ Arg::Gds(isc_dsql_wrong_param_num) <<Arg::Num(count2) << Arg::Num(count)
);
}
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/include/gen/codetext.h 2016-02-23 16:18:38 UTC (rev 63007)
@@ -875,6 +875,7 @@
{"dsql_no_sqldata", 336003108},
{"dsql_no_input_sqlda", 336003109},
{"dsql_no_output_sqlda", 336003110},
+ {"dsql_wrong_param_num", 336003111},
{"dyn_filter_not_found", 336068645},
{"dyn_func_not_found", 336068649},
{"dyn_index_not_found", 336068656},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/include/gen/iberror.h 2016-02-23 16:18:38 UTC (rev 63007)
@@ -909,6 +909,7 @@
const ISC_STATUS isc_dsql_no_sqldata = 336003108L;
const ISC_STATUS isc_dsql_no_input_sqlda = 336003109L;
const ISC_STATUS isc_dsql_no_output_sqlda = 336003110L;
+const ISC_STATUS isc_dsql_wrong_param_num = 336003111L;
const ISC_STATUS isc_dyn_filter_not_found = 336068645L;
const ISC_STATUS isc_dyn_func_not_found = 336068649L;
const ISC_STATUS isc_dyn_index_not_found = 336068656L;
@@ -1314,7 +1315,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 = 1258;
+const ISC_STATUS isc_err_max = 1259;
#else /* c definitions */
@@ -2193,6 +2194,7 @@
#define isc_dsql_no_sqldata 336003108L
#define isc_dsql_no_input_sqlda 336003109L
#define isc_dsql_no_output_sqlda 336003110L
+#define isc_dsql_wrong_param_num 336003111L
#define isc_dyn_filter_not_found 336068645L
#define isc_dyn_func_not_found 336068649L
#define isc_dyn_index_not_found 336068656L
@@ -2598,7 +2600,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 1258
+#define isc_err_max 1259
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/include/gen/msgs.h 2016-02-23 16:18:38 UTC (rev 63007)
@@ -878,6 +878,7 @@
{336003108, "empty pointer to data"}, /* dsql_no_sqldata */
{336003109, "No SQLDA for input values provided"}, /* dsql_no_input_sqlda */
{336003110, "No SQLDA for output values provided"}, /* dsql_no_output_sqlda */
+ {336003111, "Wrong number of parameters (expected @1, got @2)"}, /* dsql_wrong_param_num */
{336068645, "BLOB Filter @1 not found"}, /* dyn_filter_not_found */
{336068649, "Function @1 not found"}, /* dyn_func_not_found */
{336068656, "Index not found"}, /* dyn_index_not_found */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/include/gen/sql_code.h 2016-02-23 16:18:38 UTC (rev 63007)
@@ -874,6 +874,7 @@
{336003108, -802}, /* 36 dsql_no_sqldata */
{336003109, -802}, /* 37 dsql_no_input_sqlda */
{336003110, -802}, /* 38 dsql_no_output_sqlda */
+ {336003111, -313}, /* 39 dsql_wrong_param_num */
{336068645, -901}, /* 37 dyn_filter_not_found */
{336068649, -901}, /* 41 dyn_func_not_found */
{336068656, -901}, /* 48 dyn_index_not_found */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/include/gen/sql_state.h 2016-02-23 16:18:38 UTC (rev 63007)
@@ -874,6 +874,7 @@
{336003108, "07002"}, // 36 dsql_no_sqldata
{336003109, "07002"}, // 37 dsql_no_input_sqlda
{336003110, "07002"}, // 38 dsql_no_output_sqlda
+ {336003111, "07001"}, // 39 dsql_wrong_param_num
{336068645, "42000"}, // 37 dyn_filter_not_found
{336068649, "42000"}, // 41 dyn_func_not_found
{336068656, "42000"}, // 48 dyn_index_not_found
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/msgs/facilities2.sql 2016-02-23 16:18:38 UTC (rev 63007)
@@ -5,7 +5,7 @@
('2015-03-17 18:33:00', 'QLI', 1, 533)
('2015-01-07 18:01:51', 'GFIX', 3, 134)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
-('2016-02-15 00:48:00', 'DSQL', 7, 39)
+('2016-02-23 00:00:00', 'DSQL', 7, 40)
('2015-10-07 12:30:00', 'DYN', 8, 291)
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/msgs/messages2.sql 2016-02-23 16:18:38 UTC (rev 63007)
@@ -1681,6 +1681,7 @@
('dsql_no_sqldata', NULL, 'why.cpp', NULL, 7, 36, NULL, 'empty pointer to data', NULL, NULL);
('dsql_no_input_sqlda', NULL, NULL, NULL, 7, 37, NULL, 'No SQLDA for input values provided', NULL, NULL);
('dsql_no_output_sqlda', NULL, NULL, NULL, 7, 38, NULL, 'No SQLDA for output values provided', NULL, NULL);
+('dsql_wrong_param_num', NULL, NULL, NULL, 7, 39, NULL, 'Wrong number of parameters (expected @1, got @2)', NULL, NULL);
-- Do not change the arguments of the previous DSQL messages.
-- Write the new DSQL messages here.
-- DYN
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2016-02-23 13:38:04 UTC (rev 63006)
+++ firebird/trunk/src/msgs/system_errors2.sql 2016-02-23 16:18:38 UTC (rev 63007)
@@ -862,6 +862,7 @@
(-802, '07', '002', 7, 36, 'dsql_no_sqldata', NULL, NULL)
(-802, '07', '002', 7, 37, 'dsql_no_input_sqlda', NULL, NULL)
(-802, '07', '002', 7, 38, 'dsql_no_output_sqlda', NULL, NULL)
+(-313, '07', '001', 7, 39, 'dsql_wrong_param_num', NULL, NULL)
-- DYN
(-901, '42', '000', 8, 37, 'dyn_filter_not_found', NULL, NULL)
(-901, '42', '000', 8, 41, 'dyn_func_not_found', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-02-24 00:08:56
|
Revision: 63011
http://sourceforge.net/p/firebird/code/63011
Author: firebirds
Date: 2016-02-24 00:08:54 +0000 (Wed, 24 Feb 2016)
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 2016-02-23 20:49:56 UTC (rev 63010)
+++ firebird/trunk/ChangeLog 2016-02-24 00:08:54 UTC (rev 63011)
@@ -1,3 +1,42 @@
+ 2016-02-23 20:49 aafemt
+ M src/dsql/dsql.cpp
+Get secondary error code isc_dsql_sqlda_err back, thanks to Dmitry Yemanov
+
+ 2016-02-23 16:54 alexpeshkoff
+ A examples/dbcrypt/cryptDb.pas
+Sample of writing plugin using pascal
+
+ 2016-02-23 16:53 alexpeshkoff
+ M examples/interfaces/01.create.pas
+Misc changes in example
+
+ 2016-02-23 16:18 aafemt
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/dsql/dsql.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/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+Some more cases of CORE-5112 as pointed by Dmitry Yemanov
+
+ 2016-02-23 09:52 dimitr
+ M src/dsql/ExprNodes.cpp
+Removed "cast no-op" extensions as they break many tests, e.g. CAST('A' as CHAR(10)) remains CHAR(1) instead of being padded up to CHAR(10). Let's no-op only really equal descriptors for the time being.
+
+ 2016-02-23 09:10 dimitr
+ M src/dsql/ExprNodes.cpp
+And another postfix for CORE-5097, it resolves regression for core_3545.fbt.
+Adriano, please review.
+
+ 2016-02-23 08:20 dimitr
+ M src/jrd/Optimizer.cpp
+Yet another postfix for CORE-5097, it resolves regressions for core_1173.fbt and core_1525.fbt.
+
2016-02-22 16:20 paul_reeves
M builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
M builds/install/arch-specific/win32/ba/ProcitajMe.txt
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-23 20:49:56 UTC (rev 63010)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-24 00:08:54 UTC (rev 63011)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32349
+ FORMAL BUILD NUMBER:32356
*/
-#define PRODUCT_VER_STRING "3.0.0.32349"
-#define FILE_VER_STRING "WI-V3.0.0.32349"
-#define LICENSE_VER_STRING "WI-V3.0.0.32349"
-#define FILE_VER_NUMBER 3, 0, 0, 32349
+#define PRODUCT_VER_STRING "3.0.0.32356"
+#define FILE_VER_STRING "WI-V3.0.0.32356"
+#define LICENSE_VER_STRING "WI-V3.0.0.32356"
+#define FILE_VER_NUMBER 3, 0, 0, 32356
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32349"
+#define FB_BUILD_NO "32356"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-23 20:49:56 UTC (rev 63010)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-24 00:08:54 UTC (rev 63011)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32349
+BuildNum=32356
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...> - 2016-02-25 00:09:03
|
Revision: 63015
http://sourceforge.net/p/firebird/code/63015
Author: firebirds
Date: 2016-02-25 00:09:00 +0000 (Thu, 25 Feb 2016)
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 2016-02-24 20:11:34 UTC (rev 63014)
+++ firebird/trunk/ChangeLog 2016-02-25 00:09:00 UTC (rev 63015)
@@ -1,3 +1,13 @@
+ 2016-02-24 20:11 dimitr
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/ExprNodes.h
+ M src/jrd/Optimizer.cpp
+Checking the datatype at compile time is unreliable: some nodes return one type at compile time and another type at runtime, thus causing unexpectedly missing casts. I'm moving the check to runtime, this should fix the remaining regressions (fingers crossed).
+
+ 2016-02-24 15:32 alexpeshkoff
+ A doc/Using_OO_API.html
+Started work on new API docs
+
2016-02-23 20:49 aafemt
M src/dsql/dsql.cpp
Get secondary error code isc_dsql_sqlda_err back, thanks to Dmitry Yemanov
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-24 20:11:34 UTC (rev 63014)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-25 00:09:00 UTC (rev 63015)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32356
+ FORMAL BUILD NUMBER:32358
*/
-#define PRODUCT_VER_STRING "3.0.0.32356"
-#define FILE_VER_STRING "WI-V3.0.0.32356"
-#define LICENSE_VER_STRING "WI-V3.0.0.32356"
-#define FILE_VER_NUMBER 3, 0, 0, 32356
+#define PRODUCT_VER_STRING "3.0.0.32358"
+#define FILE_VER_STRING "WI-V3.0.0.32358"
+#define LICENSE_VER_STRING "WI-V3.0.0.32358"
+#define FILE_VER_NUMBER 3, 0, 0, 32358
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32356"
+#define FB_BUILD_NO "32358"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-24 20:11:34 UTC (rev 63014)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-25 00:09:00 UTC (rev 63015)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32356
+BuildNum=32358
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...> - 2016-02-26 00:09:28
|
Revision: 63023
http://sourceforge.net/p/firebird/code/63023
Author: firebirds
Date: 2016-02-26 00:09:25 +0000 (Fri, 26 Feb 2016)
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 2016-02-25 22:02:18 UTC (rev 63022)
+++ firebird/trunk/ChangeLog 2016-02-26 00:09:25 UTC (rev 63023)
@@ -1,3 +1,24 @@
+ 2016-02-25 09:20 hvlad
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/exe.h
+This should fix known issues with MERGE and stable cursor (see CORE-3362).
+Thanks to Dmitry for idea
+
+ 2016-02-25 02:11 asfernandes
+ M src/gpre/gpre.cpp
+Convert the file to UTF-8 as grep thinks it's a binary file.
+
+ 2016-02-25 01:50 asfernandes
+ M src/dsql/dsql.cpp
+ M src/jrd/tpc.cpp
+Misc.
+
+ 2016-02-25 01:07 asfernandes
+ M doc/Using_OO_API.html
+Typos.
+
2016-02-24 20:11 dimitr
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 2016-02-25 22:02:18 UTC (rev 63022)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-26 00:09:25 UTC (rev 63023)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32358
+ FORMAL BUILD NUMBER:32362
*/
-#define PRODUCT_VER_STRING "3.0.0.32358"
-#define FILE_VER_STRING "WI-V3.0.0.32358"
-#define LICENSE_VER_STRING "WI-V3.0.0.32358"
-#define FILE_VER_NUMBER 3, 0, 0, 32358
+#define PRODUCT_VER_STRING "3.0.0.32362"
+#define FILE_VER_STRING "WI-V3.0.0.32362"
+#define LICENSE_VER_STRING "WI-V3.0.0.32362"
+#define FILE_VER_NUMBER 3, 0, 0, 32362
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32358"
+#define FB_BUILD_NO "32362"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-25 22:02:18 UTC (rev 63022)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-26 00:09:25 UTC (rev 63023)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32358
+BuildNum=32362
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X