Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2016-02-27 00:09:15
|
Revision: 63029
http://sourceforge.net/p/firebird/code/63029
Author: firebirds
Date: 2016-02-27 00:09:13 +0000 (Sat, 27 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-26 17:19:29 UTC (rev 63028)
+++ firebird/trunk/ChangeLog 2016-02-27 00:09:13 UTC (rev 63029)
@@ -1,3 +1,23 @@
+ 2016-02-26 17:19 dimitr
+ M src/jrd/dfw.epp
+ M src/jrd/irq.h
+Split a 5-way join into two smaller joins to help the optimizer in cases when statistics is outdated (index creation time suffers when there are many tables/indices). While being there, cache requests that weren't cached yet.
+
+ 2016-02-26 16:10 alexpeshkoff
+ M doc/Using_OO_API.html
+WIP on docs
+
+ 2016-02-26 12:55 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+ M src/jrd/jrd.cpp
+ M src/jrd/nbak.cpp
+ M src/lock/lock.cpp
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+Fixed some asserts and segfaults in crypto manager
+Disable simultaneous nbackup & encrypt/decrypt operation
+
2016-02-25 09:20 hvlad
M src/dsql/BoolNodes.cpp
M src/dsql/ExprNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-26 17:19:29 UTC (rev 63028)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-27 00:09:13 UTC (rev 63029)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32362
+ FORMAL BUILD NUMBER:32365
*/
-#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 PRODUCT_VER_STRING "3.0.0.32365"
+#define FILE_VER_STRING "WI-V3.0.0.32365"
+#define LICENSE_VER_STRING "WI-V3.0.0.32365"
+#define FILE_VER_NUMBER 3, 0, 0, 32365
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32362"
+#define FB_BUILD_NO "32365"
#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-26 17:19:29 UTC (rev 63028)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-27 00:09:13 UTC (rev 63029)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32362
+BuildNum=32365
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-28 00:08:39
|
Revision: 63031
http://sourceforge.net/p/firebird/code/63031
Author: firebirds
Date: 2016-02-28 00:08:37 +0000 (Sun, 28 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-27 07:15:34 UTC (rev 63030)
+++ firebird/trunk/ChangeLog 2016-02-28 00:08:37 UTC (rev 63031)
@@ -1,3 +1,7 @@
+ 2016-02-27 07:15 dimitr
+ M doc/WhatsNew
+Updated the docs for RC2.
+
2016-02-26 17:19 dimitr
M src/jrd/dfw.epp
M src/jrd/irq.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-27 07:15:34 UTC (rev 63030)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-28 00:08:37 UTC (rev 63031)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32365
+ FORMAL BUILD NUMBER:32366
*/
-#define PRODUCT_VER_STRING "3.0.0.32365"
-#define FILE_VER_STRING "WI-V3.0.0.32365"
-#define LICENSE_VER_STRING "WI-V3.0.0.32365"
-#define FILE_VER_NUMBER 3, 0, 0, 32365
+#define PRODUCT_VER_STRING "3.0.0.32366"
+#define FILE_VER_STRING "WI-V3.0.0.32366"
+#define LICENSE_VER_STRING "WI-V3.0.0.32366"
+#define FILE_VER_NUMBER 3, 0, 0, 32366
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32365"
+#define FB_BUILD_NO "32366"
#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-27 07:15:34 UTC (rev 63030)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-28 00:08:37 UTC (rev 63031)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=32365
+BuildNum=32366
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-29 00:09:11
|
Revision: 63044
http://sourceforge.net/p/firebird/code/63044
Author: firebirds
Date: 2016-02-29 00:09:09 +0000 (Mon, 29 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-28 17:18:08 UTC (rev 63043)
+++ firebird/trunk/ChangeLog 2016-02-29 00:09:09 UTC (rev 63044)
@@ -1,3 +1,21 @@
+ 2016-02-28 09:14 dimitr
+ M src/dsql/StmtNodes.cpp
+ M src/dsql/StmtNodes.h
+ M src/dsql/parse.y
+CORE-5119: Support autocommit mode in SET TRANSACTION statement.
+
+ 2016-02-28 08:45 dimitr
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+Misc: remove the redundant space in the explained plan output.
+
+ 2016-02-28 08:41 dimitr
+ M src/misc/writeBuildNum.sh
+Set up the new version.
+
+ 2016-02-28 08:04 dimitr
+ M doc/WhatsNew
+Set up the new version.
+
2016-02-27 07:15 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-28 17:18:08 UTC (rev 63043)
+++ firebird/trunk/src/jrd/build_no.h 2016-02-29 00:09:09 UTC (rev 63044)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32366
+ FORMAL BUILD NUMBER:32370
*/
-#define PRODUCT_VER_STRING "3.0.0.32366"
-#define FILE_VER_STRING "WI-V3.0.0.32366"
-#define LICENSE_VER_STRING "WI-V3.0.0.32366"
-#define FILE_VER_NUMBER 3, 0, 0, 32366
-#define FB_MAJOR_VER "3"
+#define PRODUCT_VER_STRING "4.0.0.32370"
+#define FILE_VER_STRING "WI-T4.0.0.32370"
+#define LICENSE_VER_STRING "WI-T4.0.0.32370"
+#define FILE_VER_NUMBER 4, 0, 0, 32370
+#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32366"
-#define FB_BUILD_TYPE "V"
-#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
+#define FB_BUILD_NO "32370"
+#define FB_BUILD_TYPE "T"
+#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-28 17:18:08 UTC (rev 63043)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-02-29 00:09:09 UTC (rev 63044)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32366
+BuildNum=32370
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-03-01 00:09:48
|
Revision: 63055
http://sourceforge.net/p/firebird/code/63055
Author: firebirds
Date: 2016-03-01 00:09:46 +0000 (Tue, 01 Mar 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-29 21:40:00 UTC (rev 63054)
+++ firebird/trunk/ChangeLog 2016-03-01 00:09:46 UTC (rev 63055)
@@ -1,3 +1,7 @@
+ 2016-02-29 20:01 dimitr
+ M src/dsql/ExprNodes.cpp
+Fixed CORE-5122: Expression index may not be used by the optimizer if created and used in different connection charsets.
+
2016-02-28 09:14 dimitr
M src/dsql/StmtNodes.cpp
M src/dsql/StmtNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-02-29 21:40:00 UTC (rev 63054)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-01 00:09:46 UTC (rev 63055)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32370
+ FORMAL BUILD NUMBER:32371
*/
-#define PRODUCT_VER_STRING "4.0.0.32370"
-#define FILE_VER_STRING "WI-T4.0.0.32370"
-#define LICENSE_VER_STRING "WI-T4.0.0.32370"
-#define FILE_VER_NUMBER 4, 0, 0, 32370
+#define PRODUCT_VER_STRING "4.0.0.32371"
+#define FILE_VER_STRING "WI-T4.0.0.32371"
+#define LICENSE_VER_STRING "WI-T4.0.0.32371"
+#define FILE_VER_NUMBER 4, 0, 0, 32371
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32370"
+#define FB_BUILD_NO "32371"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-02-29 21:40:00 UTC (rev 63054)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-01 00:09:46 UTC (rev 63055)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32370
+BuildNum=32371
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-03-03 00:09:18
|
Revision: 63073
http://sourceforge.net/p/firebird/code/63073
Author: firebirds
Date: 2016-03-03 00:09:15 +0000 (Thu, 03 Mar 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-03-02 15:33:16 UTC (rev 63072)
+++ firebird/trunk/ChangeLog 2016-03-03 00:09:15 UTC (rev 63073)
@@ -1,3 +1,17 @@
+ 2016-03-02 15:33 aafemt
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/vio.cpp
+ M src/jrd/vio_proto.h
+Savepoints refactoring that fixes CORE-4701, CORE-4424 and CORE-4483
+
+ 2016-03-02 15:23 paulbeach
+ M extern/cloop/src/tests/test1/CTest.c
+malloc.h is no longer needed (LibreOffice)
+
2016-02-29 20:01 dimitr
M src/dsql/ExprNodes.cpp
Fixed CORE-5122: Expression index may not be used by the optimizer if created and used in different connection charsets.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-02 15:33:16 UTC (rev 63072)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-03 00:09:15 UTC (rev 63073)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32371
+ FORMAL BUILD NUMBER:32373
*/
-#define PRODUCT_VER_STRING "4.0.0.32371"
-#define FILE_VER_STRING "WI-T4.0.0.32371"
-#define LICENSE_VER_STRING "WI-T4.0.0.32371"
-#define FILE_VER_NUMBER 4, 0, 0, 32371
+#define PRODUCT_VER_STRING "4.0.0.32373"
+#define FILE_VER_STRING "WI-T4.0.0.32373"
+#define LICENSE_VER_STRING "WI-T4.0.0.32373"
+#define FILE_VER_NUMBER 4, 0, 0, 32373
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32371"
+#define FB_BUILD_NO "32373"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-02 15:33:16 UTC (rev 63072)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-03 00:09:15 UTC (rev 63073)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32371
+BuildNum=32373
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-03-03 22:52:05
|
Revision: 63083
http://sourceforge.net/p/firebird/code/63083
Author: asfernandes
Date: 2016-03-03 22:52:03 +0000 (Thu, 03 Mar 2016)
Log Message:
-----------
Warnings.
Modified Paths:
--------------
firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
firebird/trunk/src/common/call_service.cpp
Modified: firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp
===================================================================
--- firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2016-03-03 20:32:45 UTC (rev 63082)
+++ firebird/trunk/examples/dbcrypt/CryptKeyHolder.cpp 2016-03-03 22:52:03 UTC (rev 63083)
@@ -255,7 +255,7 @@
char kn[40];
strcpy(kn, "Key");
- strncat(kn, keyName, sizeof(kn));
+ strncat(kn, keyName, sizeof(kn) - 3 - 1);
kn[sizeof(kn) - 1] = 0;
IConfigEntry* confEntry = getEntry(status, kn);
Modified: firebird/trunk/src/common/call_service.cpp
===================================================================
--- firebird/trunk/src/common/call_service.cpp 2016-03-03 20:32:45 UTC (rev 63082)
+++ firebird/trunk/src/common/call_service.cpp 2016-03-03 22:52:03 UTC (rev 63083)
@@ -257,7 +257,7 @@
if (status[1] == 0)
return svc_handle;
if (status[1] != isc_network_error)
- return NULL;
+ return 0;
fb_utils::init_status(status);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-03-04 00:10:08
|
Revision: 63085
http://sourceforge.net/p/firebird/code/63085
Author: firebirds
Date: 2016-03-04 00:10:06 +0000 (Fri, 04 Mar 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-03-03 22:53:31 UTC (rev 63084)
+++ firebird/trunk/ChangeLog 2016-03-04 00:10:06 UTC (rev 63085)
@@ -1,3 +1,31 @@
+ 2016-03-03 22:52 asfernandes
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M src/common/call_service.cpp
+Warnings.
+
+ 2016-03-03 15:04 paulbeach
+ M src/jrd/recsrc/HashJoin.cpp
+Fix qsort_r for Darwin
+
+ 2016-03-03 15:03 alexpeshkoff
+ M doc/Using_OO_API.html
+Work in progress
+
+ 2016-03-03 11:57 paulbeach
+ M extern/cloop/src/tests/test1/CTest.c
+Reverse Cloop change (LibreeOffice), until it can be examined properly.
+
+ 2016-03-03 11:44 aafemt
+ M src/common/pretty.cpp
+ M src/gpre/boot/gpre_meta_boot.cpp
+ M src/gpre/c_cxx.cpp
+ M src/gpre/cme.cpp
+ M src/gpre/cmp.cpp
+ M src/gpre/int_cxx.cpp
+ M src/gpre/obj_cxx.cpp
+ M src/gpre/std/gpre_meta.epp
+Boolean datatype in gpre C++ module
+
2016-03-02 15:33 aafemt
M src/dsql/ExprNodes.cpp
M src/dsql/StmtNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-03 22:53:31 UTC (rev 63084)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-04 00:10:06 UTC (rev 63085)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32373
+ FORMAL BUILD NUMBER:32378
*/
-#define PRODUCT_VER_STRING "4.0.0.32373"
-#define FILE_VER_STRING "WI-T4.0.0.32373"
-#define LICENSE_VER_STRING "WI-T4.0.0.32373"
-#define FILE_VER_NUMBER 4, 0, 0, 32373
+#define PRODUCT_VER_STRING "4.0.0.32378"
+#define FILE_VER_STRING "WI-T4.0.0.32378"
+#define LICENSE_VER_STRING "WI-T4.0.0.32378"
+#define FILE_VER_NUMBER 4, 0, 0, 32378
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32373"
+#define FB_BUILD_NO "32378"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-03 22:53:31 UTC (rev 63084)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-04 00:10:06 UTC (rev 63085)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32373
+BuildNum=32378
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-03-05 00:09:23
|
Revision: 63093
http://sourceforge.net/p/firebird/code/63093
Author: firebirds
Date: 2016-03-05 00:09:20 +0000 (Sat, 05 Mar 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-03-04 12:59:17 UTC (rev 63092)
+++ firebird/trunk/ChangeLog 2016-03-05 00:09:20 UTC (rev 63093)
@@ -1,3 +1,20 @@
+ 2016-03-04 09:00 paul_reeves
+ M builds/install/arch-specific/win32/BuildExecutableInstall.bat
+ M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+ M builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+ M builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
+ M builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
+ M builds/install/arch-specific/win32/installation_readme.txt
+ M builds/install/arch-specific/win32/ru/installation_readme.txt
+ A builds/win32/msvc10/VCCRT_Shared_Body.wxi
+ A builds/win32/msvc10/VCCRT_Shared_Header.wxi
+ A builds/win32/msvc10/VCCRT_Win32.wxi
+ A builds/win32/msvc10/VCCRT_Win32.wxs
+ A builds/win32/msvc10/VCCRT_x64.wxi
+ A builds/win32/msvc10/VCCRT_x64.wxs
+Sync recent windows installer changes for fb3 into trunk
+
2016-03-03 22:52 asfernandes
M examples/dbcrypt/CryptKeyHolder.cpp
M src/common/call_service.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-04 12:59:17 UTC (rev 63092)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-05 00:09:20 UTC (rev 63093)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32378
+ FORMAL BUILD NUMBER:32379
*/
-#define PRODUCT_VER_STRING "4.0.0.32378"
-#define FILE_VER_STRING "WI-T4.0.0.32378"
-#define LICENSE_VER_STRING "WI-T4.0.0.32378"
-#define FILE_VER_NUMBER 4, 0, 0, 32378
+#define PRODUCT_VER_STRING "4.0.0.32379"
+#define FILE_VER_STRING "WI-T4.0.0.32379"
+#define LICENSE_VER_STRING "WI-T4.0.0.32379"
+#define FILE_VER_NUMBER 4, 0, 0, 32379
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32378"
+#define FB_BUILD_NO "32379"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-04 12:59:17 UTC (rev 63092)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-05 00:09:20 UTC (rev 63093)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32378
+BuildNum=32379
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-03-05 12:28:07
|
Revision: 63096
http://sourceforge.net/p/firebird/code/63096
Author: aafemt
Date: 2016-03-05 12:28:04 +0000 (Sat, 05 Mar 2016)
Log Message:
-----------
Optimized hash function for lock manager and hash join
Modified Paths:
--------------
firebird/trunk/builds/posix/make.rules
firebird/trunk/builds/posix/prefix.linux
firebird/trunk/builds/posix/prefix.linux_amd64
firebird/trunk/builds/win32/msvc10/common.vcxproj
firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
firebird/trunk/builds/win32/msvc12/common.vcxproj
firebird/trunk/builds/win32/msvc12/common.vcxproj.filters
firebird/trunk/src/common/classes/Hash.h
firebird/trunk/src/jrd/lck.cpp
firebird/trunk/src/jrd/recsrc/HashJoin.cpp
firebird/trunk/src/lock/lock.cpp
firebird/trunk/src/lock/print.cpp
Added Paths:
-----------
firebird/trunk/src/common/CRC32C.cpp
firebird/trunk/src/common/classes/Hash.cpp
Modified: firebird/trunk/builds/posix/make.rules
===================================================================
--- firebird/trunk/builds/posix/make.rules 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/posix/make.rules 2016-03-05 12:28:04 UTC (rev 63096)
@@ -32,16 +32,16 @@
# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
-WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include $(CPPFLAGS)
+WFLAGS =-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include $(CPPFLAGS)
ifeq ($(TARGET),Release)
- WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
+ WFLAGS += $(PROD_FLAGS)
else
- WFLAGS:= $(WFLAGS) $(DEV_FLAGS) -DDEV_BUILD
+ WFLAGS += $(DEV_FLAGS) -DDEV_BUILD
endif
-WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS) $(GLOB_OPTIONS)
-WCXXFLAGS:= $(WFLAGS) $(THR_FLAGS) $(RTTI_FLAG) $(CXXFLAGS) $(GLOB_OPTIONS)
+WCFLAGS = $(WFLAGS) $(THR_FLAGS) $(CFLAGS) $(GLOB_OPTIONS)
+WCXXFLAGS = $(WFLAGS) $(THR_FLAGS) $(RTTI_FLAG) $(CXXFLAGS) $(GLOB_OPTIONS)
# Here we have definitions for using the preprocessor.
Modified: firebird/trunk/builds/posix/prefix.linux
===================================================================
--- firebird/trunk/builds/posix/prefix.linux 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/posix/prefix.linux 2016-03-05 12:28:04 UTC (rev 63096)
@@ -25,3 +25,6 @@
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
#DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
+
+# This file must be compiled with SSE4.2 support
+%/CRC32C.o: COMMON_FLAGS += -msse4
Modified: firebird/trunk/builds/posix/prefix.linux_amd64
===================================================================
--- firebird/trunk/builds/posix/prefix.linux_amd64 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/posix/prefix.linux_amd64 2016-03-05 12:28:04 UTC (rev 63096)
@@ -25,3 +25,6 @@
PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) -fmax-errors=8
+
+# This file must be compiled with SSE4.2 support
+%/CRC32C.o: COMMON_FLAGS += -msse4
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj 2016-03-05 12:28:04 UTC (rev 63096)
@@ -30,6 +30,7 @@
<ClCompile Include="..\..\..\src\common\classes\ClumpletWriter.cpp" />
<ClCompile Include="..\..\..\src\common\classes\DbImplementation.cpp" />
<ClCompile Include="..\..\..\src\common\classes\fb_string.cpp" />
+ <ClCompile Include="..\..\..\src\common\classes\Hash.cpp" />
<ClCompile Include="..\..\..\src\common\classes\ImplementHelper.cpp" />
<ClCompile Include="..\..\..\src\common\classes\init.cpp" />
<ClCompile Include="..\..\..\src\common\classes\InternalMessageBuffer.cpp" />
@@ -49,6 +50,16 @@
<ClCompile Include="..\..\..\src\common\config\ConfigCache.cpp" />
<ClCompile Include="..\..\..\src\common\config\config_file.cpp" />
<ClCompile Include="..\..\..\src\common\config\dir_list.cpp" />
+ <ClCompile Include="..\..\..\src\common\CRC32C.cpp">
+ <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IntrinsicFunctions>
+ <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IntrinsicFunctions>
+ <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IntrinsicFunctions>
+ <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IntrinsicFunctions>
+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ProgramDatabase</DebugInformationFormat>
+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ProgramDatabase</DebugInformationFormat>
+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ProgramDatabase</DebugInformationFormat>
+ <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
<ClCompile Include="..\..\..\src\common\cvt.cpp" />
<ClCompile Include="..\..\..\src\common\db_alias.cpp" />
<ClCompile Include="..\..\..\src\common\dllinst.cpp" />
Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters 2016-03-05 12:28:04 UTC (rev 63096)
@@ -210,6 +210,12 @@
<ClCompile Include="..\..\..\src\common\Tokens.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\common\classes\Hash.cpp">
+ <Filter>classes</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\common\CRC32C.cpp">
+ <Filter>classes</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\common\xdr_proto.h">
Modified: firebird/trunk/builds/win32/msvc12/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc12/common.vcxproj 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/win32/msvc12/common.vcxproj 2016-03-05 12:28:04 UTC (rev 63096)
@@ -30,6 +30,7 @@
<ClCompile Include="..\..\..\src\common\classes\ClumpletWriter.cpp" />
<ClCompile Include="..\..\..\src\common\classes\DbImplementation.cpp" />
<ClCompile Include="..\..\..\src\common\classes\fb_string.cpp" />
+ <ClCompile Include="..\..\..\src\common\classes\Hash.cpp" />
<ClCompile Include="..\..\..\src\common\classes\ImplementHelper.cpp" />
<ClCompile Include="..\..\..\src\common\classes\init.cpp" />
<ClCompile Include="..\..\..\src\common\classes\InternalMessageBuffer.cpp" />
@@ -49,6 +50,12 @@
<ClCompile Include="..\..\..\src\common\config\ConfigCache.cpp" />
<ClCompile Include="..\..\..\src\common\config\config_file.cpp" />
<ClCompile Include="..\..\..\src\common\config\dir_list.cpp" />
+ <ClCompile Include="..\..\..\src\common\CRC32C.cpp">
+ <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IntrinsicFunctions>
+ <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IntrinsicFunctions>
+ <EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ </ClCompile>
<ClCompile Include="..\..\..\src\common\cvt.cpp" />
<ClCompile Include="..\..\..\src\common\db_alias.cpp" />
<ClCompile Include="..\..\..\src\common\dllinst.cpp" />
Modified: firebird/trunk/builds/win32/msvc12/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc12/common.vcxproj.filters 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/builds/win32/msvc12/common.vcxproj.filters 2016-03-05 12:28:04 UTC (rev 63096)
@@ -210,6 +210,12 @@
<ClCompile Include="..\..\..\src\common\Tokens.cpp">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\common\classes\Hash.cpp">
+ <Filter>classes</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\common\CRC32C.cpp">
+ <Filter>common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\common\xdr_proto.h">
Added: firebird/trunk/src/common/CRC32C.cpp
===================================================================
--- firebird/trunk/src/common/CRC32C.cpp (rev 0)
+++ firebird/trunk/src/common/CRC32C.cpp 2016-03-05 12:28:04 UTC (rev 63096)
@@ -0,0 +1,69 @@
+/*
+ * PROGRAM: Common Library
+ * MODULE: CRC32C.cpp
+ * DESCRIPTION: Hardware-accelerated hash calculation
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+ *
+ * Software distributed under the License is distributed AS IS,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights
+ * and limitations under the License.
+ *
+ * The Original Code was created by Dmitry Sibiryakov
+ * for the Firebird Open Source RDBMS project.
+ *
+ * Copyright (c) 2015 Dmitry Sibiryakov
+ * and all contributors signed below.
+ *
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ *
+ */
+
+#include "firebird.h"
+
+// Can be used only on x86 architectures
+// WARNING: With GCC must be compiled separately with -msse4.2 flag
+#if defined(_M_IX86) || defined(_M_X64) || defined(__x86_64__) || defined(__i386__)
+
+#include <nmmintrin.h>
+#include "../common/classes/Hash.h"
+
+namespace Firebird
+{
+unsigned int CRC32C(const unsigned char* value, unsigned int length)
+{
+ unsigned int hash_value = 0;
+ if (length == 1)
+ {
+ return _mm_crc32_u8(hash_value, *value);
+ }
+ if (length == 2)
+ {
+ return _mm_crc32_u16(hash_value, *(unsigned short*)value);
+ }
+ while (length >= 4)
+ {
+ hash_value = _mm_crc32_u32(hash_value, *(unsigned int*)value);
+ value += 4;
+ length -= 4;
+ }
+ if (length >= 2)
+ {
+ hash_value = _mm_crc32_u16(hash_value, *(unsigned short*)value);
+ length -= 2;
+ }
+ if (length)
+ {
+ value += 2;
+ hash_value = _mm_crc32_u8(hash_value, *value);
+ }
+ return hash_value;
+}
+} // namespace
+#endif // architecture check
Property changes on: firebird/trunk/src/common/CRC32C.cpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: firebird/trunk/src/common/classes/Hash.cpp
===================================================================
--- firebird/trunk/src/common/classes/Hash.cpp (rev 0)
+++ firebird/trunk/src/common/classes/Hash.cpp 2016-03-05 12:28:04 UTC (rev 63096)
@@ -0,0 +1,98 @@
+/*
+ * PROGRAM: Common Library
+ * MODULE: Hash.cpp
+ * DESCRIPTION: Hash of data
+ *
+ * The contents of this file are subject to the Initial
+ * Developer's Public License Version 1.0 (the "License");
+ * you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ * http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+ *
+ * Software distributed under the License is distributed AS IS,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights
+ * and limitations under the License.
+ *
+ * The Original Code was created by Inprise Corporation
+ * and its predecessors. Portions created by Inprise Corporation are
+ * Copyright (C) Inprise Corporation.
+ *
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ *
+ */
+
+#include "firebird.h"
+#include "../common/classes/Hash.h"
+
+namespace Firebird
+{
+
+static unsigned int basicHash(const unsigned char* value, unsigned int length)
+{
+ unsigned int hash_value = 0;
+ unsigned char* p;
+ const unsigned char* q = value;
+ while (length >= 4)
+ {
+ p = (unsigned char*) &hash_value;
+ p[0] += q[0];
+ p[1] += q[1];
+ p[2] += q[2];
+ p[3] += q[3];
+ length -= 4;
+ q += 4;
+ }
+ p = (unsigned char*) &hash_value;
+ if (length >= 2)
+ {
+ p[0] += q[0];
+ p[1] += q[1];
+ length -= 2;
+ }
+ if (length)
+ {
+ q += 2;
+ *p += *q;
+ }
+ return hash_value;
+}
+
+#if defined(_M_IX86) || defined(_M_X64) || defined(__x86_64__) || defined(__i386__)
+
+#ifdef _MSC_VER
+
+#include <intrin.h>
+#define bit_SSE4_2 (1 << 20)
+// MS VC has its own definition of __cpuid
+static bool SSE4_2Supported()
+{
+ int flags[4];
+ __cpuid(flags, 1);
+ return (flags[2] & bit_SSE4_2) != 0;
+}
+
+#else
+
+#include <cpuid.h>
+// GCC - its own
+static bool SSE4_2Supported()
+{
+ unsigned int eax,ebx,ecx,edx;
+ __cpuid(1, eax, ebx, ecx, edx);
+ return (ecx & bit_SSE4_2) != 0;
+}
+
+#endif
+
+unsigned int CRC32C(const unsigned char* value, unsigned int length);
+
+someHashFunc someHash = SSE4_2Supported()?CRC32C:basicHash;
+#else
+someHashFunc someHash = basicHash;
+#endif // Architecture check
+
+const char* hashName = someHash == CRC32C? "CRC32C": "Basic";
+
+} // namespace
\ No newline at end of file
Property changes on: firebird/trunk/src/common/classes/Hash.cpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/src/common/classes/Hash.h
===================================================================
--- firebird/trunk/src/common/classes/Hash.h 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/src/common/classes/Hash.h 2016-03-05 12:28:04 UTC (rev 63096)
@@ -331,6 +331,16 @@
}; // class iterator
}; // class Hash
+typedef unsigned int (*someHashFunc)(const unsigned char* value, unsigned int length);
+
+extern someHashFunc someHash;
+extern const char* hashName;
+
+inline unsigned int hash(const void* value, unsigned int length, unsigned int hashSize)
+{
+ return someHash((const unsigned char*)value, length) % hashSize;
+}
+
} // namespace Firebird
#endif // CLASSES_HASH_H
Modified: firebird/trunk/src/jrd/lck.cpp
===================================================================
--- firebird/trunk/src/jrd/lck.cpp 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/src/jrd/lck.cpp 2016-03-05 12:28:04 UTC (rev 63096)
@@ -28,6 +28,7 @@
#include "firebird.h"
#include <stdio.h>
+#include "../common/classes/Hash.h"
#include "../jrd/jrd.h"
#include "../jrd/lck.h"
#include "gen/iberror.h"
@@ -59,7 +60,6 @@
static bool compatible(const Lock*, const Lock*, USHORT);
static void enqueue(thread_db*, CheckStatusWrapper*, Lock*, USHORT, SSHORT);
static int external_ast(void*);
-static USHORT hash_func(const UCHAR*, USHORT);
static void hash_allocate(Lock*);
static Lock* hash_get_lock(Lock*, USHORT*, Lock***);
static void hash_insert_lock(Lock*);
@@ -954,38 +954,6 @@
}
-
-static USHORT hash_func(const UCHAR* value, USHORT length)
-{
-/**************************************
- *
- * h a s h
- *
- **************************************
- *
- * Functional description
- * Provide a repeatable hash value based
- * on the passed key.
- *
- **************************************/
-
- // Hash the value, preserving its distribution as much as possible
-
- ULONG hash_value = 0;
- UCHAR* p = 0;
- const UCHAR* q = value;
-
- for (USHORT l = 0; l < length; l++)
- {
- if (!(l & 3))
- p = (UCHAR*) &hash_value;
- *p++ += *q++;
- }
-
- return (USHORT) (hash_value % LOCK_HASH_SIZE);
-}
-
-
static void hash_allocate(Lock* lock)
{
/**************************************
@@ -1036,7 +1004,7 @@
if (!att->att_compatibility_table)
hash_allocate(lock);
- const USHORT hash_value = hash_func((UCHAR*) &lock->lck_key, lock->lck_length);
+ const USHORT hash_value = hash(&lock->lck_key, lock->lck_length, LOCK_HASH_SIZE);
if (hash_slot)
*hash_slot = hash_value;
Modified: firebird/trunk/src/jrd/recsrc/HashJoin.cpp
===================================================================
--- firebird/trunk/src/jrd/recsrc/HashJoin.cpp 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/src/jrd/recsrc/HashJoin.cpp 2016-03-05 12:28:04 UTC (rev 63096)
@@ -21,6 +21,7 @@
*/
#include "firebird.h"
+#include "../common/classes/Hash.h"
#include "../jrd/jrd.h"
#include "../jrd/btr.h"
#include "../jrd/req.h"
@@ -249,7 +250,7 @@
};
public:
- HashTable(MemoryPool& pool, size_t streamCount, size_t tableSize = HASH_SIZE)
+ HashTable(MemoryPool& pool, size_t streamCount, unsigned int tableSize = HASH_SIZE)
: PermanentStorage(pool), m_streamCount(streamCount),
m_tableSize(tableSize), m_slot(0)
{
@@ -265,28 +266,11 @@
delete[] m_collisions;
}
- size_t hash(ULONG length, const UCHAR* buffer) const
- {
- ULONG hash_value = 0;
-
- UCHAR* p = NULL;
- const UCHAR* q = buffer;
- for (size_t l = 0; l < length; l++)
- {
- if (!(l & 3))
- p = (UCHAR*) &hash_value;
-
- *p++ += *q++;
- }
-
- return (hash_value % m_tableSize);
- }
-
void put(size_t stream,
ULONG keyLength, const KeyBuffer* keyBuffer,
ULONG offset, ULONG position)
{
- const size_t slot = hash(keyLength, keyBuffer->begin() + offset);
+ const unsigned int slot = hash(keyBuffer->begin() + offset, keyLength, m_tableSize);
fb_assert(stream < m_streamCount);
fb_assert(slot < m_tableSize);
@@ -304,7 +288,7 @@
bool setup(ULONG length, const UCHAR* data)
{
- const size_t slot = hash(length, data);
+ const unsigned int slot = hash(data, length, m_tableSize);
for (size_t i = 0; i < m_streamCount; i++)
{
@@ -350,7 +334,7 @@
private:
const size_t m_streamCount;
- const size_t m_tableSize;
+ const unsigned int m_tableSize;
CollisionList** m_collisions;
size_t m_slot;
};
Modified: firebird/trunk/src/lock/lock.cpp
===================================================================
--- firebird/trunk/src/lock/lock.cpp 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/src/lock/lock.cpp 2016-03-05 12:28:04 UTC (rev 63096)
@@ -51,6 +51,7 @@
#include "../common/isc_s_proto.h"
#include "../common/config/config.h"
#include "../common/classes/array.h"
+#include "../common/classes/Hash.h"
#include "../common/classes/semaphore.h"
#include "../common/classes/init.h"
#include "../common/classes/timestamp.h"
@@ -2087,7 +2088,6 @@
}
#endif
-
lbl* LockManager::find_lock(USHORT series,
const UCHAR* value,
USHORT length,
@@ -2107,23 +2107,9 @@
*
**************************************/
- // Hash the value preserving its distribution as much as possible
-
- ULONG hash_value = 0;
- { // scope
- UCHAR* p = NULL; // silence uninitialized warning
- const UCHAR* q = value;
- for (USHORT l = 0; l < length; l++)
- {
- if (!(l & 3))
- p = (UCHAR*) &hash_value;
- *p++ += *q++;
- }
- } // scope
-
// See if the lock already exists
- const USHORT hash_slot = *slot = (USHORT) (hash_value % m_sharedMemory->getHeader()->lhb_hash_slots);
+ const USHORT hash_slot = *slot = (USHORT) Firebird::hash(value, length, m_sharedMemory->getHeader()->lhb_hash_slots);
ASSERT_ACQUIRED;
srq* const hash_header = &m_sharedMemory->getHeader()->lhb_hash[hash_slot];
Modified: firebird/trunk/src/lock/print.cpp
===================================================================
--- firebird/trunk/src/lock/print.cpp 2016-03-05 03:39:36 UTC (rev 63095)
+++ firebird/trunk/src/lock/print.cpp 2016-03-05 12:28:04 UTC (rev 63096)
@@ -851,6 +851,7 @@
SLONG hash_max_count = 0;
SLONG hash_min_count = 10000000;
USHORT i = 0;
+ unsigned int distribution[21] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
for (const srq* slot = LOCK_header->lhb_hash; i < LOCK_header->lhb_hash_slots; slot++, i++)
{
SLONG hash_lock_count = 0;
@@ -864,6 +865,9 @@
hash_min_count = hash_lock_count;
if (hash_lock_count > hash_max_count)
hash_max_count = hash_lock_count;
+ if (hash_lock_count > 20)
+ hash_lock_count = 20;
+ ++distribution[hash_lock_count];
}
FPRINTF(outfile, "\tHash slots: %4d, ", LOCK_header->lhb_hash_slots);
@@ -872,6 +876,16 @@
hash_min_count, (hash_total_count / LOCK_header->lhb_hash_slots),
hash_max_count);
+ FPRINTF(outfile, "\tHash lengths distribution:\n");
+ if (hash_max_count >= 20)
+ hash_max_count = 19;
+ for (int i = hash_min_count; i<=hash_max_count; ++i)
+ {
+ FPRINTF(outfile, "\t\t%-2d : %8u\t(%d%%)\n", i, distribution[i], distribution[i]*100/LOCK_header->lhb_hash_slots);
+ }
+ if (hash_max_count == 19)
+ FPRINTF(outfile, "\t\t> : %8u\t(%d%%)\n", distribution[20], distribution[20]*100/LOCK_header->lhb_hash_slots);
+
const shb* a_shb = (shb*) SRQ_ABS_PTR(LOCK_header->lhb_secondary);
FPRINTF(outfile,
"\tRemove node: %6"SLONGFORMAT", Insert queue: %6"SLONGFORMAT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-03-06 00:09:37
|
Revision: 63099
http://sourceforge.net/p/firebird/code/63099
Author: firebirds
Date: 2016-03-06 00:09:35 +0000 (Sun, 06 Mar 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-03-05 17:40:49 UTC (rev 63098)
+++ firebird/trunk/ChangeLog 2016-03-06 00:09:35 UTC (rev 63099)
@@ -1,3 +1,44 @@
+ 2016-03-05 17:40 dimitr
+ M src/common/CRC32C.cpp
+ M src/common/classes/Hash.cpp
+ M src/common/classes/Hash.h
+ M src/common/db_alias.cpp
+ M src/jrd/Mapping.cpp
+ M src/jrd/dfw.epp
+ M src/jrd/lck.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/lock/lock.cpp
+Misc refactoring:
+1) Renamed Hash class to HashTable
+2) Reversed data/length arguments
+3) Moved hash() routine to its own class/namespace
+4) Fixed the license text
+
+ 2016-03-05 13:03 aafemt
+ M src/common/config/config.h
+Correction
+
+ 2016-03-05 12:28 aafemt
+ M builds/posix/make.rules
+ M builds/posix/prefix.linux
+ M builds/posix/prefix.linux_amd64
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/common.vcxproj.filters
+ M builds/win32/msvc12/common.vcxproj
+ M builds/win32/msvc12/common.vcxproj.filters
+ A src/common/CRC32C.cpp
+ A src/common/classes/Hash.cpp
+ M src/common/classes/Hash.h
+ M src/jrd/lck.cpp
+ M src/jrd/recsrc/HashJoin.cpp
+ M src/lock/lock.cpp
+ M src/lock/print.cpp
+Optimized hash function for lock manager and hash join
+
+ 2016-03-05 03:39 asfernandes
+ M src/gpre/c_cxx.cpp
+Make the generated code compatible with gcc 6 in C++-14 mode.
+
2016-03-04 09:00 paul_reeves
M builds/install/arch-specific/win32/BuildExecutableInstall.bat
M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-05 17:40:49 UTC (rev 63098)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-06 00:09:35 UTC (rev 63099)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32379
+ FORMAL BUILD NUMBER:32383
*/
-#define PRODUCT_VER_STRING "4.0.0.32379"
-#define FILE_VER_STRING "WI-T4.0.0.32379"
-#define LICENSE_VER_STRING "WI-T4.0.0.32379"
-#define FILE_VER_NUMBER 4, 0, 0, 32379
+#define PRODUCT_VER_STRING "4.0.0.32383"
+#define FILE_VER_STRING "WI-T4.0.0.32383"
+#define LICENSE_VER_STRING "WI-T4.0.0.32383"
+#define FILE_VER_NUMBER 4, 0, 0, 32383
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32379"
+#define FB_BUILD_NO "32383"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-05 17:40:49 UTC (rev 63098)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-06 00:09:35 UTC (rev 63099)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32379
+BuildNum=32383
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-03-06 08:32:23
|
Revision: 63101
http://sourceforge.net/p/firebird/code/63101
Author: dimitr
Date: 2016-03-06 08:32:18 +0000 (Sun, 06 Mar 2016)
Log Message:
-----------
Renamed security3.fdb -> security4.fdb.
Modified Paths:
--------------
firebird/trunk/autogen.sh
firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
firebird/trunk/builds/install/misc/databases.conf.in
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/builds/install/posix-common/posixLibrary.sh.in
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/builds/posix/make.defaults
firebird/trunk/builds/win32/make_all.bat
firebird/trunk/builds/win32/make_boot.bat
firebird/trunk/configure.ac
firebird/trunk/src/CMakeLists.txt
firebird/trunk/src/common/config/config.cpp
Modified: firebird/trunk/autogen.sh
===================================================================
--- firebird/trunk/autogen.sh 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/autogen.sh 2016-03-06 08:32:18 UTC (rev 63101)
@@ -3,7 +3,7 @@
# Run this to generate all the initial makefiles, etc.
#
-PKG_NAME=Firebird3
+PKG_NAME=Firebird4
SRCDIR=`dirname $0`
if [ -z "$AUTORECONF" ]
Modified: firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -37,7 +37,7 @@
BuildRootDir=..
BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image
-SecurityDatabase=security3.fdb
+SecurityDatabase=security4.fdb
#------------------------------------------------------------------------
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc 2016-03-06 08:32:18 UTC (rev 63101)
@@ -792,7 +792,7 @@
SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
-SharedFileArray[30].Filename := ExpandConstant('{app}')+'security3.fdb';
+SharedFileArray[30].Filename := ExpandConstant('{app}')+'security4.fdb';
SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@@ -1177,7 +1177,7 @@
LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
- RenameFile(GetAppPath+'\security3.fdb', GetAppPath+'\security3.fdb.preRC1');
+ RenameFile(GetAppPath+'\security4.fdb', GetAppPath+'\security4.fdb.preRC1');
end
end
end;
@@ -1185,7 +1185,7 @@
function ConfigureAuthentication: boolean;
begin
- if FileExists(WizardDirValue + '\security3.fdb') then
+ if FileExists(WizardDirValue + '\security4.fdb') then
Result := false
else
Result := true;
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2016-03-06 08:32:18 UTC (rev 63101)
@@ -474,8 +474,8 @@
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent;
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists;
Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
-Source: {#FilesDir}\security3.fdb; DestDir: {app}; Destname: security3.fdb.empty; Components: ServerComponent;
-Source: {#FilesDir}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
+Source: {#FilesDir}\security4.fdb; DestDir: {app}; Destname: security4.fdb.empty; Components: ServerComponent;
+Source: {#FilesDir}\security4.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@@ -1074,7 +1074,7 @@
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
- IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false);
+ IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security4.fdb', false);
InitSecurityDB;
@@ -1189,8 +1189,8 @@
aStringList.add(appPath+'\firebird.log');
aStringList.add(appPath+'\databases.conf');
aStringList.add(appPath+'\fbtrace.conf');
- aStringList.add(appPath+'\security3.fdb');
- aStringList.add(appPath+'\security3.fdb.old');
+ aStringList.add(appPath+'\security4.fdb');
+ aStringList.add(appPath+'\security4.fdb.old');
for count := 0 to aStringList.count - 1 do begin
// We are manually handling the share count of these files, so we must
Modified: firebird/trunk/builds/install/misc/databases.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/databases.conf.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/misc/databases.conf.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -24,7 +24,7 @@
# Master security database specific setup.
# Do not remove it until you understand well what are you doing!
#
-security.db = $(dir_secDb)/security3.fdb
+security.db = $(dir_secDb)/security4.fdb
{
RemoteAccess = false
DefaultDbCachePages = 50
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -772,7 +772,7 @@
#
# Type: string (pathname)
#
-#SecurityDatabase = $(dir_secDb)/security3.fdb
+#SecurityDatabase = $(dir_secDb)/security4.fdb
# ==============================
Modified: firebird/trunk/builds/install/posix-common/posixLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/posix-common/posixLibrary.sh.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/posix-common/posixLibrary.sh.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -43,7 +43,7 @@
OrigPasswd=""
TmpFile=""
MANIFEST_TXT=""
-SecurityDatabase=security3.fdb
+SecurityDatabase=security4.fdb
DefaultLibrary=libfbclient
UninstallScript=FirebirdUninstall.sh
ArchiveDateTag=`date +"%Y%m%d_%H%M"`
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/posix/Makefile.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -310,7 +310,7 @@
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
HELP_FDB = $(FIREBIRD)/help/help.fdb
-SECURITY_FDB = $(FIREBIRD)/security3.fdb
+SECURITY_FDB = $(FIREBIRD)/security4.fdb
SECURITY_TMP = security.tmp
databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/posix/make.defaults 2016-03-06 08:32:18 UTC (rev 63101)
@@ -351,7 +351,7 @@
INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
-SECURITY_FDB = $(FIREBIRD)/security3.fdb
+SECURITY_FDB = $(FIREBIRD)/security4.fdb
# From qli
QLI = $(BIN)/qli$(EXEC_EXT)
Modified: firebird/trunk/builds/win32/make_all.bat
===================================================================
--- firebird/trunk/builds/win32/make_all.bat 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/win32/make_all.bat 2016-03-06 08:32:18 UTC (rev 63101)
@@ -73,7 +73,7 @@
@copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul
:: DATABASES
-@copy %FB_GEN_DIR%\dbs\security3.FDB %FB_OUTPUT_DIR%\security3.fdb >nul
+@copy %FB_GEN_DIR%\dbs\security4.FDB %FB_OUTPUT_DIR%\security4.fdb >nul
@copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul
:: DOCS
Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/win32/make_boot.bat 2016-03-06 08:32:18 UTC (rev 63101)
@@ -236,9 +236,9 @@
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
@mkdir %FB_GEN_DIR%\dbs 2>nul
-@echo create database '%FB_GEN_DB_DIR%\dbs\security3.fdb'; | "%FB_BIN_DIR%\isql" -q
-@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security3.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
-@copy %FB_GEN_DIR%\dbs\security3.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
+@echo create database '%FB_GEN_DB_DIR%\dbs\security4.fdb'; | "%FB_BIN_DIR%\isql" -q
+@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security4.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
+@copy %FB_GEN_DIR%\dbs\security4.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
@%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb
Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/configure.ac 2016-03-06 08:32:18 UTC (rev 63101)
@@ -1339,7 +1339,7 @@
dnl Print out the build configuration (the most interesting thing)
echo
echo
-echo The Firebird3 package has been configured with the following options:
+echo The Firebird4 package has been configured with the following options:
echo
case $DEVEL_FLG in
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/src/CMakeLists.txt 2016-03-06 08:32:18 UTC (rev 63101)
@@ -936,7 +936,7 @@
add_custom_target(copy_files
#ALL # uncomment this to copy files every build
# databases
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security3.fdb
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security4.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb
# configs, text files
COMMAND sed "/@UDF_COMMENT@/d" < ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in > ${output_dir}/firebird.conf
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/src/common/config/config.cpp 2016-03-06 08:32:18 UTC (rev 63101)
@@ -185,7 +185,7 @@
#endif
{TYPE_STRING, "UserManager", (ConfigValue) "Srp"},
{TYPE_STRING, "TracePlugin", (ConfigValue) "fbtrace"},
- {TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security3.fdb"}, // security database name
+ {TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security4.fdb"}, // security database name
{TYPE_STRING, "ServerMode", (ConfigValue) "Super"},
{TYPE_STRING, "WireCrypt", (ConfigValue) NULL},
{TYPE_STRING, "WireCryptPlugin", (ConfigValue) "Arc4"},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2016-03-07 00:09:16
|
Revision: 63102
http://sourceforge.net/p/firebird/code/63102
Author: firebirds
Date: 2016-03-07 00:09:14 +0000 (Mon, 07 Mar 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-03-06 08:32:18 UTC (rev 63101)
+++ firebird/trunk/ChangeLog 2016-03-07 00:09:14 UTC (rev 63102)
@@ -1,3 +1,241 @@
+ 2016-03-06 08:32 dimitr
+ M autogen.sh
+ M builds/install/arch-specific/linux/makeInstallImage.sh.in
+ M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+ M builds/install/misc/databases.conf.in
+ M builds/install/misc/firebird.conf.in
+ M builds/install/posix-common/posixLibrary.sh.in
+ M builds/posix/Makefile.in
+ M builds/posix/make.defaults
+ M builds/win32/make_all.bat
+ M builds/win32/make_boot.bat
+ M configure.ac
+ M src/CMakeLists.txt
+ M src/common/config/config.cpp
+Renamed security3.fdb -> security4.fdb.
+
+ 2016-03-06 08:17 dimitr
+ M builds/win32/make_all.bat
+ M builds/win32/make_boot.bat
+ M builds/win32/make_examples.bat
+ A builds/win32/msvc10/Firebird.sln (from /firebird/trunk/builds/win32/msvc10/Firebird3.sln:63050)
+ D builds/win32/msvc10/Firebird3.sln
+ D builds/win32/msvc10/Firebird3Boot.sln
+ D builds/win32/msvc10/Firebird3_Examples.sln
+ A builds/win32/msvc10/FirebirdBoot.sln (from /firebird/trunk/builds/win32/msvc10/Firebird3Boot.sln:63033)
+ A builds/win32/msvc10/FirebirdCommon.props (from /firebird/trunk/builds/win32/msvc10/firebird2.props:63033)
+ A builds/win32/msvc10/FirebirdDebug.props (from /firebird/trunk/builds/win32/msvc10/firebird2debug.props:63033)
+ A builds/win32/msvc10/FirebirdExamples.sln (from /firebird/trunk/builds/win32/msvc10/Firebird3_Examples.sln:63033)
+ A builds/win32/msvc10/FirebirdRelease.props (from /firebird/trunk/builds/win32/msvc10/firebird2release.props:63033)
+ M builds/win32/msvc10/alice.vcxproj
+ M builds/win32/msvc10/btyacc.vcxproj
+ M builds/win32/msvc10/build_msg.vcxproj
+ M builds/win32/msvc10/burp.vcxproj
+ M builds/win32/msvc10/codes.vcxproj
+ M builds/win32/msvc10/common.vcxproj
+ M builds/win32/msvc10/empbuild.vcxproj
+ M builds/win32/msvc10/engine.vcxproj
+ M builds/win32/msvc10/fb2control.vcxproj
+ M builds/win32/msvc10/fb_lock_print.vcxproj
+ M builds/win32/msvc10/fbguard.vcxproj
+ M builds/win32/msvc10/fbrmclib.vcxproj
+ M builds/win32/msvc10/fbserver.vcxproj
+ M builds/win32/msvc10/fbsvcmgr.vcxproj
+ M builds/win32/msvc10/fbtrace.vcxproj
+ M builds/win32/msvc10/fbtracemgr.vcxproj
+ M builds/win32/msvc10/fbudf.vcxproj
+ D builds/win32/msvc10/firebird2.props
+ D builds/win32/msvc10/firebird2debug.props
+ D builds/win32/msvc10/firebird2release.props
+ M builds/win32/msvc10/gbak.vcxproj
+ M builds/win32/msvc10/gfix.vcxproj
+ M builds/win32/msvc10/gpre.vcxproj
+ M builds/win32/msvc10/gpre_boot.vcxproj
+ M builds/win32/msvc10/gpre_common.vcxproj
+ M builds/win32/msvc10/gsec.vcxproj
+ M builds/win32/msvc10/gsplit.vcxproj
+ M builds/win32/msvc10/gstat.vcxproj
+ M builds/win32/msvc10/ib_udf.vcxproj
+ M builds/win32/msvc10/ib_util.vcxproj
+ M builds/win32/msvc10/instclient.vcxproj
+ M builds/win32/msvc10/instreg.vcxproj
+ M builds/win32/msvc10/instsvc.vcxproj
+ M builds/win32/msvc10/intl.vcxproj
+ M builds/win32/msvc10/intlbuild.vcxproj
+ M builds/win32/msvc10/isql.vcxproj
+ M builds/win32/msvc10/legacy_auth.vcxproj
+ M builds/win32/msvc10/legacy_usermanager.vcxproj
+ M builds/win32/msvc10/nbackup.vcxproj
+ M builds/win32/msvc10/qli.vcxproj
+ M builds/win32/msvc10/remote.vcxproj
+ M builds/win32/msvc10/srp.vcxproj
+ M builds/win32/msvc10/udr_engine.vcxproj
+ M builds/win32/msvc10/udrcpp_example.vcxproj
+ M builds/win32/msvc10/yvalve.vcxproj
+ A builds/win32/msvc12/Firebird.sln (from /firebird/trunk/builds/win32/msvc12/Firebird3.sln:63033)
+ D builds/win32/msvc12/Firebird3.sln
+ D builds/win32/msvc12/Firebird3Boot.sln
+ D builds/win32/msvc12/Firebird3_Examples.sln
+ A builds/win32/msvc12/FirebirdBoot.sln (from /firebird/trunk/builds/win32/msvc12/Firebird3Boot.sln:63033)
+ A builds/win32/msvc12/FirebirdCommon.props (from /firebird/trunk/builds/win32/msvc12/firebird2.props:63033)
+ A builds/win32/msvc12/FirebirdDebug.props (from /firebird/trunk/builds/win32/msvc12/firebird2debug.props:63033)
+ A builds/win32/msvc12/FirebirdExamples.sln (from /firebird/trunk/builds/win32/msvc12/Firebird3_Examples.sln:63033)
+ A builds/win32/msvc12/FirebirdRelease.props (from /firebird/trunk/builds/win32/msvc12/firebird2release.props:63033)
+ M builds/win32/msvc12/alice.vcxproj
+ M builds/win32/msvc12/btyacc.vcxproj
+ M builds/win32/msvc12/build_msg.vcxproj
+ M builds/win32/msvc12/burp.vcxproj
+ M builds/win32/msvc12/codes.vcxproj
+ M builds/win32/msvc12/common.vcxproj
+ M builds/win32/msvc12/empbuild.vcxproj
+ M builds/win32/msvc12/engine.vcxproj
+ M builds/win32/msvc12/fb2control.vcxproj
+ M builds/win32/msvc12/fb_lock_print.vcxproj
+ M builds/win32/msvc12/fbguard.vcxproj
+ M builds/win32/msvc12/fbrmclib.vcxproj
+ M builds/win32/msvc12/fbserver.vcxproj
+ M builds/win32/msvc12/fbsvcmgr.vcxproj
+ M builds/win32/msvc12/fbtrace.vcxproj
+ M builds/win32/msvc12/fbtracemgr.vcxproj
+ M builds/win32/msvc12/fbudf.vcxproj
+ D builds/win32/msvc12/firebird2.props
+ D builds/win32/msvc12/firebird2debug.props
+ D builds/win32/msvc12/firebird2release.props
+ M builds/win32/msvc12/gbak.vcxproj
+ M builds/win32/msvc12/gfix.vcxproj
+ M builds/win32/msvc12/gpre.vcxproj
+ M builds/win32/msvc12/gpre_boot.vcxproj
+ M builds/win32/msvc12/gpre_common.vcxproj
+ M builds/win32/msvc12/gsec.vcxproj
+ M builds/win32/msvc12/gsplit.vcxproj
+ M builds/win32/msvc12/gstat.vcxproj
+ M builds/win32/msvc12/ib_udf.vcxproj
+ M builds/win32/msvc12/ib_util.vcxproj
+ M builds/win32/msvc12/instclient.vcxproj
+ M builds/win32/msvc12/instreg.vcxproj
+ M builds/win32/msvc12/instsvc.vcxproj
+ M builds/win32/msvc12/intl.vcxproj
+ M builds/win32/msvc12/intlbuild.vcxproj
+ M builds/win32/msvc12/isql.vcxproj
+ M builds/win32/msvc12/legacy_auth.vcxproj
+ M builds/win32/msvc12/legacy_usermanager.vcxproj
+ M builds/win32/msvc12/nbackup.vcxproj
+ M builds/win32/msvc12/qli.vcxproj
+ M builds/win32/msvc12/remote.vcxproj
+ M builds/win32/msvc12/srp.vcxproj
+ M builds/win32/msvc12/udr_engine.vcxproj
+ M builds/win32/msvc12/udrcpp_example.vcxproj
+ M builds/win32/msvc12/yvalve.vcxproj
+ M builds/win32/msvc7/gds32.vcproj
+ A builds/win32/msvc8/Firebird.sln (from /firebird/trunk/builds/win32/msvc8/Firebird3.sln:63033)
+ D builds/win32/msvc8/Firebird3.sln
+ D builds/win32/msvc8/Firebird3Boot.sln
+ D builds/win32/msvc8/Firebird3_Examples.sln
+ A builds/win32/msvc8/FirebirdBoot.sln (from /firebird/trunk/builds/win32/msvc8/Firebird3Boot.sln:63033)
+ A builds/win32/msvc8/FirebirdCommon.vsprops (from /firebird/trunk/builds/win32/msvc8/firebird2.vsprops:63033)
+ A builds/win32/msvc8/FirebirdDebug.vsprops (from /firebird/trunk/builds/win32/msvc8/firebird2debug.vsprops:63033)
+ A builds/win32/msvc8/FirebirdExamples.sln (from /firebird/trunk/builds/win32/msvc8/Firebird3_Examples.sln:63033)
+ A builds/win32/msvc8/FirebirdRelease.vsprops (from /firebird/trunk/builds/win32/msvc8/firebird2release.vsprops:63033)
+ M builds/win32/msvc8/alice.vcproj
+ M builds/win32/msvc8/btyacc.vcproj
+ M builds/win32/msvc8/build_msg.vcproj
+ M builds/win32/msvc8/burp.vcproj
+ M builds/win32/msvc8/codes.vcproj
+ M builds/win32/msvc8/common.vcproj
+ M builds/win32/msvc8/empbuild.vcproj
+ M builds/win32/msvc8/engine.vcproj
+ M builds/win32/msvc8/fb2control.vcproj
+ M builds/win32/msvc8/fb_lock_print.vcproj
+ M builds/win32/msvc8/fbguard.vcproj
+ M builds/win32/msvc8/fbrmclib.vcproj
+ M builds/win32/msvc8/fbserver.vcproj
+ M builds/win32/msvc8/fbsvcmgr.vcproj
+ M builds/win32/msvc8/fbtrace.vcproj
+ M builds/win32/msvc8/fbtracemgr.vcproj
+ M builds/win32/msvc8/fbudf.vcproj
+ D builds/win32/msvc8/firebird2.vsprops
+ D builds/win32/msvc8/firebird2debug.vsprops
+ D builds/win32/msvc8/firebird2release.vsprops
+ M builds/win32/msvc8/gbak.vcproj
+ M builds/win32/msvc8/gfix.vcproj
+ M builds/win32/msvc8/gpre.vcproj
+ M builds/win32/msvc8/gpre_boot.vcproj
+ M builds/win32/msvc8/gpre_common.vcproj
+ M builds/win32/msvc8/gsec.vcproj
+ M builds/win32/msvc8/gsplit.vcproj
+ M builds/win32/msvc8/gstat.vcproj
+ M builds/win32/msvc8/ib_udf.vcproj
+ M builds/win32/msvc8/ib_util.vcproj
+ M builds/win32/msvc8/instclient.vcproj
+ M builds/win32/msvc8/instreg.vcproj
+ M builds/win32/msvc8/instsvc.vcproj
+ M builds/win32/msvc8/intl.vcproj
+ M builds/win32/msvc8/intlbuild.vcproj
+ M builds/win32/msvc8/isql.vcproj
+ M builds/win32/msvc8/legacy_usermanager.vcproj
+ M builds/win32/msvc8/nbackup.vcproj
+ M builds/win32/msvc8/qli.vcproj
+ M builds/win32/msvc8/remote.vcproj
+ M builds/win32/msvc8/srp.vcproj
+ M builds/win32/msvc8/udr_engine.vcproj
+ M builds/win32/msvc8/udrcpp_example.vcproj
+ M builds/win32/msvc8/yvalve.vcproj
+ A builds/win32/msvc9/Firebird.sln (from /firebird/trunk/builds/win32/msvc9/Firebird3.sln:63033)
+ D builds/win32/msvc9/Firebird3.sln
+ D builds/win32/msvc9/Firebird3Boot.sln
+ D builds/win32/msvc9/Firebird3_Examples.sln
+ A builds/win32/msvc9/FirebirdBoot.sln (from /firebird/trunk/builds/win32/msvc9/Firebird3Boot.sln:63033)
+ A builds/win32/msvc9/FirebirdCommon.vsprops (from /firebird/trunk/builds/win32/msvc9/firebird2.vsprops:63033)
+ A builds/win32/msvc9/FirebirdDebug.vsprops (from /firebird/trunk/builds/win32/msvc9/firebird2debug.vsprops:63033)
+ A builds/win32/msvc9/FirebirdExamples.sln (from /firebird/trunk/builds/win32/msvc9/Firebird3_Examples.sln:63033)
+ A builds/win32/msvc9/FirebirdRelease.vsprops (from /firebird/trunk/builds/win32/msvc9/firebird2release.vsprops:63033)
+ M builds/win32/msvc9/alice.vcproj
+ M builds/win32/msvc9/btyacc.vcproj
+ M builds/win32/msvc9/build_msg.vcproj
+ M builds/win32/msvc9/burp.vcproj
+ M builds/win32/msvc9/codes.vcproj
+ M builds/win32/msvc9/common.vcproj
+ M builds/win32/msvc9/empbuild.vcproj
+ M builds/win32/msvc9/engine.vcproj
+ M builds/win32/msvc9/fb2control.vcproj
+ M builds/win32/msvc9/fb_lock_print.vcproj
+ M builds/win32/msvc9/fbguard.vcproj
+ M builds/win32/msvc9/fbrmclib.vcproj
+ M builds/win32/msvc9/fbserver.vcproj
+ M builds/win32/msvc9/fbsvcmgr.vcproj
+ M builds/win32/msvc9/fbtrace.vcproj
+ M builds/win32/msvc9/fbtracemgr.vcproj
+ M builds/win32/msvc9/fbudf.vcproj
+ D builds/win32/msvc9/firebird2.vsprops
+ D builds/win32/msvc9/firebird2debug.vsprops
+ D builds/win32/msvc9/firebird2release.vsprops
+ M builds/win32/msvc9/gbak.vcproj
+ M builds/win32/msvc9/gfix.vcproj
+ M builds/win32/msvc9/gpre.vcproj
+ M builds/win32/msvc9/gpre_boot.vcproj
+ M builds/win32/msvc9/gpre_common.vcproj
+ M builds/win32/msvc9/gsec.vcproj
+ M builds/win32/msvc9/gsplit.vcproj
+ M builds/win32/msvc9/gstat.vcproj
+ M builds/win32/msvc9/ib_udf.vcproj
+ M builds/win32/msvc9/ib_util.vcproj
+ M builds/win32/msvc9/instclient.vcproj
+ M builds/win32/msvc9/instreg.vcproj
+ M builds/win32/msvc9/instsvc.vcproj
+ M builds/win32/msvc9/intl.vcproj
+ M builds/win32/msvc9/intlbuild.vcproj
+ M builds/win32/msvc9/isql.vcproj
+ M builds/win32/msvc9/legacy_usermanager.vcproj
+ M builds/win32/msvc9/nbackup.vcproj
+ M builds/win32/msvc9/qli.vcproj
+ M builds/win32/msvc9/remote.vcproj
+ M builds/win32/msvc9/srp.vcproj
+ M builds/win32/msvc9/udr_engine.vcproj
+ M builds/win32/msvc9/udrcpp_example.vcproj
+ M builds/win32/msvc9/yvalve.vcproj
+Removed filename dependencies on FB version, to avoid renaming them with the every release. Cleaned up the MSVC6 remainings.
+
2016-03-05 17:40 dimitr
M src/common/CRC32C.cpp
M src/common/classes/Hash.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-06 08:32:18 UTC (rev 63101)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-07 00:09:14 UTC (rev 63102)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32383
+ FORMAL BUILD NUMBER:32385
*/
-#define PRODUCT_VER_STRING "4.0.0.32383"
-#define FILE_VER_STRING "WI-T4.0.0.32383"
-#define LICENSE_VER_STRING "WI-T4.0.0.32383"
-#define FILE_VER_NUMBER 4, 0, 0, 32383
+#define PRODUCT_VER_STRING "4.0.0.32385"
+#define FILE_VER_STRING "WI-T4.0.0.32385"
+#define LICENSE_VER_STRING "WI-T4.0.0.32385"
+#define FILE_VER_NUMBER 4, 0, 0, 32385
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32383"
+#define FB_BUILD_NO "32385"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-06 08:32:18 UTC (rev 63101)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-07 00:09:14 UTC (rev 63102)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32383
+BuildNum=32385
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-03-08 00:08:17
|
Revision: 63105
http://sourceforge.net/p/firebird/code/63105
Author: firebirds
Date: 2016-03-08 00:08:15 +0000 (Tue, 08 Mar 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-03-07 22:27:17 UTC (rev 63104)
+++ firebird/trunk/ChangeLog 2016-03-08 00:08:15 UTC (rev 63105)
@@ -1,3 +1,7 @@
+ 2016-03-07 15:51 aafemt
+ M builds/win32/msvc12/fbtrace.vcxproj
+Correction
+
2016-03-06 08:32 dimitr
M autogen.sh
M builds/install/arch-specific/linux/makeInstallImage.sh.in
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-07 22:27:17 UTC (rev 63104)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-08 00:08:15 UTC (rev 63105)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32385
+ FORMAL BUILD NUMBER:32386
*/
-#define PRODUCT_VER_STRING "4.0.0.32385"
-#define FILE_VER_STRING "WI-T4.0.0.32385"
-#define LICENSE_VER_STRING "WI-T4.0.0.32385"
-#define FILE_VER_NUMBER 4, 0, 0, 32385
+#define PRODUCT_VER_STRING "4.0.0.32386"
+#define FILE_VER_STRING "WI-T4.0.0.32386"
+#define LICENSE_VER_STRING "WI-T4.0.0.32386"
+#define FILE_VER_NUMBER 4, 0, 0, 32386
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32385"
+#define FB_BUILD_NO "32386"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-07 22:27:17 UTC (rev 63104)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-08 00:08:15 UTC (rev 63105)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32385
+BuildNum=32386
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-03-09 00:11:13
|
Revision: 63113
http://sourceforge.net/p/firebird/code/63113
Author: firebirds
Date: 2016-03-09 00:11:10 +0000 (Wed, 09 Mar 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-03-08 18:41:39 UTC (rev 63112)
+++ firebird/trunk/ChangeLog 2016-03-09 00:11:10 UTC (rev 63113)
@@ -1,3 +1,23 @@
+ 2016-03-08 18:41 aafemt
+ M src/dsql/DdlNodes.h
+ M src/dsql/parse.y
+Disable several NOT NULL for one field (CORE-5141)
+
+ 2016-03-08 18:07 dimitr
+ M src/dsql/DdlNodes.epp
+Fixed CORE-5133: "Alter sequence restart with" does not change the initial value.
+
+ 2016-03-08 17:10 hvlad
+ M src/jrd/jrd.cpp
+Fixed bug CORE-5140 : Wrong error message when user tries to set number of page buffers into not supported value
+
+ 2016-03-08 10:26 aafemt
+ M src/common/classes/Nullable.h
+ M src/dsql/DdlNodes.h
+ M src/dsql/Parser.h
+ M src/dsql/parse.y
+Position independent sequence parameters in DDL
+
2016-03-07 15:51 aafemt
M builds/win32/msvc12/fbtrace.vcxproj
Correction
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-08 18:41:39 UTC (rev 63112)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-09 00:11:10 UTC (rev 63113)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32386
+ FORMAL BUILD NUMBER:32390
*/
-#define PRODUCT_VER_STRING "4.0.0.32386"
-#define FILE_VER_STRING "WI-T4.0.0.32386"
-#define LICENSE_VER_STRING "WI-T4.0.0.32386"
-#define FILE_VER_NUMBER 4, 0, 0, 32386
+#define PRODUCT_VER_STRING "4.0.0.32390"
+#define FILE_VER_STRING "WI-T4.0.0.32390"
+#define LICENSE_VER_STRING "WI-T4.0.0.32390"
+#define FILE_VER_NUMBER 4, 0, 0, 32390
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32386"
+#define FB_BUILD_NO "32390"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-08 18:41:39 UTC (rev 63112)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-09 00:11:10 UTC (rev 63113)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32386
+BuildNum=32390
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-03-10 00:08:38
|
Revision: 63128
http://sourceforge.net/p/firebird/code/63128
Author: firebirds
Date: 2016-03-10 00:08:36 +0000 (Thu, 10 Mar 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-03-09 21:03:31 UTC (rev 63127)
+++ firebird/trunk/ChangeLog 2016-03-10 00:08:36 UTC (rev 63128)
@@ -1,3 +1,15 @@
+ 2016-03-09 18:45 asfernandes
+ M src/dsql/BoolNodes.cpp
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/ExprNodes.cpp
+Fixed CORE-5130 - Compiler issues message about "invalid request BLR" when attempt to compile wrong DDL of view with both subquery and "WITH CHECK OPTION" in its DDL.
+
+ 2016-03-09 14:58 alexpeshkoff
+ M src/jrd/CryptoManager.cpp
+ M src/jrd/CryptoManager.h
+Fixed CORE-5144: Deadlock when database is encrypted or decrypted under high parallel load
+
2016-03-08 18:41 aafemt
M src/dsql/DdlNodes.h
M src/dsql/parse.y
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-09 21:03:31 UTC (rev 63127)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-10 00:08:36 UTC (rev 63128)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32390
+ FORMAL BUILD NUMBER:32392
*/
-#define PRODUCT_VER_STRING "4.0.0.32390"
-#define FILE_VER_STRING "WI-T4.0.0.32390"
-#define LICENSE_VER_STRING "WI-T4.0.0.32390"
-#define FILE_VER_NUMBER 4, 0, 0, 32390
+#define PRODUCT_VER_STRING "4.0.0.32392"
+#define FILE_VER_STRING "WI-T4.0.0.32392"
+#define LICENSE_VER_STRING "WI-T4.0.0.32392"
+#define FILE_VER_NUMBER 4, 0, 0, 32392
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32390"
+#define FB_BUILD_NO "32392"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-09 21:03:31 UTC (rev 63127)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-10 00:08:36 UTC (rev 63128)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32390
+BuildNum=32392
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-03-11 00:09:43
|
Revision: 63136
http://sourceforge.net/p/firebird/code/63136
Author: firebirds
Date: 2016-03-11 00:09:40 +0000 (Fri, 11 Mar 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-03-10 18:36:48 UTC (rev 63135)
+++ firebird/trunk/ChangeLog 2016-03-11 00:09:40 UTC (rev 63136)
@@ -1,3 +1,7 @@
+ 2016-03-10 16:37 dimitr
+ M src/common/classes/Hash.cpp
+This should fix linkage on non-Intel platforms, thanks to Dimitry Sibiryakov.
+
2016-03-09 18:45 asfernandes
M src/dsql/BoolNodes.cpp
M src/dsql/DdlNodes.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-10 18:36:48 UTC (rev 63135)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-11 00:09:40 UTC (rev 63136)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32392
+ FORMAL BUILD NUMBER:32393
*/
-#define PRODUCT_VER_STRING "4.0.0.32392"
-#define FILE_VER_STRING "WI-T4.0.0.32392"
-#define LICENSE_VER_STRING "WI-T4.0.0.32392"
-#define FILE_VER_NUMBER 4, 0, 0, 32392
+#define PRODUCT_VER_STRING "4.0.0.32393"
+#define FILE_VER_STRING "WI-T4.0.0.32393"
+#define LICENSE_VER_STRING "WI-T4.0.0.32393"
+#define FILE_VER_NUMBER 4, 0, 0, 32393
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32392"
+#define FB_BUILD_NO "32393"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-10 18:36:48 UTC (rev 63135)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-11 00:09:40 UTC (rev 63136)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32392
+BuildNum=32393
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-03-12 00:08:26
|
Revision: 63145
http://sourceforge.net/p/firebird/code/63145
Author: firebirds
Date: 2016-03-12 00:08:24 +0000 (Sat, 12 Mar 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-03-11 15:11:38 UTC (rev 63144)
+++ firebird/trunk/ChangeLog 2016-03-12 00:08:24 UTC (rev 63145)
@@ -1,3 +1,25 @@
+ 2016-03-11 15:11 alexpeshkoff
+ M examples/dbcrypt/CryptApplication.cpp
+ M examples/dbcrypt/CryptKeyHolder.cpp
+ M examples/dbcrypt/DbCrypt.cpp
+ M examples/interfaces/05.user_metadata.cpp
+ M examples/interfaces/ifaceExamples.h
+Fixed CORE-5134: Samples of dbcrypt-related plugins contain references to internal files
+
+ 2016-03-11 14:10 aafemt
+ M src/gpre/c_cxx.cpp
+ M src/gpre/int_cxx.cpp
+ M src/gpre/obj_cxx.cpp
+Use public datatype FB_BOOLEAN for preprocessed files. Thanks to Dmitry Yemanov
+
+ 2016-03-11 08:50 dimitr
+ M src/dsql/ExprNodes.h
+Fixed CORE-5149: LEFT JOIN incorrectly pushes COALESCE into the inner stream causing wrong results.
+
+ 2016-03-11 00:58 asfernandes
+ M src/common/classes/Hash.cpp
+Fix for clang.
+
2016-03-10 16:37 dimitr
M src/common/classes/Hash.cpp
This should fix linkage on non-Intel platforms, thanks to Dimitry Sibiryakov.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-11 15:11:38 UTC (rev 63144)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-12 00:08:24 UTC (rev 63145)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32393
+ FORMAL BUILD NUMBER:32397
*/
-#define PRODUCT_VER_STRING "4.0.0.32393"
-#define FILE_VER_STRING "WI-T4.0.0.32393"
-#define LICENSE_VER_STRING "WI-T4.0.0.32393"
-#define FILE_VER_NUMBER 4, 0, 0, 32393
+#define PRODUCT_VER_STRING "4.0.0.32397"
+#define FILE_VER_STRING "WI-T4.0.0.32397"
+#define LICENSE_VER_STRING "WI-T4.0.0.32397"
+#define FILE_VER_NUMBER 4, 0, 0, 32397
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32393"
+#define FB_BUILD_NO "32397"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-11 15:11:38 UTC (rev 63144)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-12 00:08:24 UTC (rev 63145)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32393
+BuildNum=32397
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-03-15 00:08:52
|
Revision: 63153
http://sourceforge.net/p/firebird/code/63153
Author: firebirds
Date: 2016-03-15 00:08:50 +0000 (Tue, 15 Mar 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-03-14 17:24:58 UTC (rev 63152)
+++ firebird/trunk/ChangeLog 2016-03-15 00:08:50 UTC (rev 63153)
@@ -1,3 +1,13 @@
+ 2016-03-14 09:11 aafemt
+ M src/jrd/validation.cpp
+Fix false positive index missing entries on already deleted records
+
+ 2016-03-14 09:02 dimitr
+ M src/jrd/opt.cpp
+ M src/jrd/recsrc/NestedLoopJoin.cpp
+ M src/jrd/recsrc/RecordSource.h
+Misc changes.
+
2016-03-11 15:11 alexpeshkoff
M examples/dbcrypt/CryptApplication.cpp
M examples/dbcrypt/CryptKeyHolder.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-14 17:24:58 UTC (rev 63152)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-15 00:08:50 UTC (rev 63153)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32397
+ FORMAL BUILD NUMBER:32399
*/
-#define PRODUCT_VER_STRING "4.0.0.32397"
-#define FILE_VER_STRING "WI-T4.0.0.32397"
-#define LICENSE_VER_STRING "WI-T4.0.0.32397"
-#define FILE_VER_NUMBER 4, 0, 0, 32397
+#define PRODUCT_VER_STRING "4.0.0.32399"
+#define FILE_VER_STRING "WI-T4.0.0.32399"
+#define LICENSE_VER_STRING "WI-T4.0.0.32399"
+#define FILE_VER_NUMBER 4, 0, 0, 32399
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32397"
+#define FB_BUILD_NO "32399"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-14 17:24:58 UTC (rev 63152)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-15 00:08:50 UTC (rev 63153)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32397
+BuildNum=32399
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-03-16 00:09:47
|
Revision: 63162
http://sourceforge.net/p/firebird/code/63162
Author: firebirds
Date: 2016-03-16 00:09:45 +0000 (Wed, 16 Mar 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-03-15 17:19:17 UTC (rev 63161)
+++ firebird/trunk/ChangeLog 2016-03-16 00:09:45 UTC (rev 63162)
@@ -1,3 +1,7 @@
+ 2016-03-15 10:42 hvlad
+ M src/remote/server/server.cpp
+Fixed "bug" CORE-5139 : mistake in comment "can't ise MutexLockGuard here"
+
2016-03-14 09:11 aafemt
M src/jrd/validation.cpp
Fix false positive index missing entries on already deleted records
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-15 17:19:17 UTC (rev 63161)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-16 00:09:45 UTC (rev 63162)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32399
+ FORMAL BUILD NUMBER:32400
*/
-#define PRODUCT_VER_STRING "4.0.0.32399"
-#define FILE_VER_STRING "WI-T4.0.0.32399"
-#define LICENSE_VER_STRING "WI-T4.0.0.32399"
-#define FILE_VER_NUMBER 4, 0, 0, 32399
+#define PRODUCT_VER_STRING "4.0.0.32400"
+#define FILE_VER_STRING "WI-T4.0.0.32400"
+#define LICENSE_VER_STRING "WI-T4.0.0.32400"
+#define FILE_VER_NUMBER 4, 0, 0, 32400
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32399"
+#define FB_BUILD_NO "32400"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-15 17:19:17 UTC (rev 63161)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-16 00:09:45 UTC (rev 63162)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32399
+BuildNum=32400
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-03-17 00:08:24
|
Revision: 63173
http://sourceforge.net/p/firebird/code/63173
Author: firebirds
Date: 2016-03-17 00:08:22 +0000 (Thu, 17 Mar 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-03-16 18:33:13 UTC (rev 63172)
+++ firebird/trunk/ChangeLog 2016-03-17 00:08:22 UTC (rev 63173)
@@ -1,3 +1,8 @@
+ 2016-03-16 02:45 asfernandes
+ M src/dsql/DsqlCompilerScratch.cpp
+ M src/dsql/DsqlCompilerScratch.h
+Add debug utility function to dump contexts.
+
2016-03-15 10:42 hvlad
M src/remote/server/server.cpp
Fixed "bug" CORE-5139 : mistake in comment "can't ise MutexLockGuard here"
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2016-03-16 18:33:13 UTC (rev 63172)
+++ firebird/trunk/src/jrd/build_no.h 2016-03-17 00:08:22 UTC (rev 63173)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:32400
+ FORMAL BUILD NUMBER:32401
*/
-#define PRODUCT_VER_STRING "4.0.0.32400"
-#define FILE_VER_STRING "WI-T4.0.0.32400"
-#define LICENSE_VER_STRING "WI-T4.0.0.32400"
-#define FILE_VER_NUMBER 4, 0, 0, 32400
+#define PRODUCT_VER_STRING "4.0.0.32401"
+#define FILE_VER_STRING "WI-T4.0.0.32401"
+#define LICENSE_VER_STRING "WI-T4.0.0.32401"
+#define FILE_VER_NUMBER 4, 0, 0, 32401
#define FB_MAJOR_VER "4"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "32400"
+#define FB_BUILD_NO "32401"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2016-03-16 18:33:13 UTC (rev 63172)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2016-03-17 00:08:22 UTC (rev 63173)
@@ -9,7 +9,7 @@
MajorVer=4
MinorVer=0
RevNo=0
-BuildNum=32400
+BuildNum=32401
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