Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2015-07-03 00:09:36
|
Revision: 61921
http://sourceforge.net/p/firebird/code/61921
Author: firebirds
Date: 2015-07-03 00:09:33 +0000 (Fri, 03 Jul 2015)
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 2015-07-02 15:44:45 UTC (rev 61920)
+++ firebird/trunk/ChangeLog 2015-07-03 00:09:33 UTC (rev 61921)
@@ -1,3 +1,25 @@
+ 2015-07-02 15:44 alexpeshkoff
+ M src/remote/client/interface.cpp
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+Fixed CORE-4854: Client library incorrectly handles non-UTF8 representation of international characters in SPB
+
+ 2015-07-02 15:35 alexpeshkoff
+ M src/auth/SecureRemotePassword/srp.cpp
+Add more debugging info
+
+ 2015-07-02 15:34 alexpeshkoff
+ M src/yvalve/why.cpp
+Totally misc
+
+ 2015-07-02 11:28 paulbeach
+ M builds/posix/Makefile.in.extern.editline
+Fix problem where ar flags are duplicated in editline make on HPUX ia64
+
+ 2015-07-02 08:47 paulbeach
+ M builds/install/arch-specific/darwin/launchdss.org.firebird.gds.plist
+improved plist for SuperServer on Yosemite (10.10), thanks to David Nock
+
2015-07-01 19:02 dimitr
M src/isql/show.epp
This should fix the SHOW SEQU output on 64-bit Linux.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-02 15:44:45 UTC (rev 61920)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-03 00:09:33 UTC (rev 61921)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31911
+ FORMAL BUILD NUMBER:31916
*/
-#define PRODUCT_VER_STRING "3.0.0.31911"
-#define FILE_VER_STRING "WI-T3.0.0.31911"
-#define LICENSE_VER_STRING "WI-T3.0.0.31911"
-#define FILE_VER_NUMBER 3, 0, 0, 31911
+#define PRODUCT_VER_STRING "3.0.0.31916"
+#define FILE_VER_STRING "WI-T3.0.0.31916"
+#define LICENSE_VER_STRING "WI-T3.0.0.31916"
+#define FILE_VER_NUMBER 3, 0, 0, 31916
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31911"
+#define FB_BUILD_NO "31916"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-02 15:44:45 UTC (rev 61920)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-03 00:09:33 UTC (rev 61921)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31911
+BuildNum=31916
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...> - 2015-07-04 00:12:07
|
Revision: 61932
http://sourceforge.net/p/firebird/code/61932
Author: firebirds
Date: 2015-07-04 00:12:04 +0000 (Sat, 04 Jul 2015)
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 2015-07-03 18:50:48 UTC (rev 61931)
+++ firebird/trunk/ChangeLog 2015-07-04 00:12:04 UTC (rev 61932)
@@ -1,3 +1,19 @@
+ 2015-07-03 16:18 asfernandes
+ M src/dsql/DdlNodes.epp
+Fixed CORE-4846 - Altering a trigger indicating other table than the original does not reflect the change.
+
+ 2015-07-03 11:48 dimitr
+ M src/misc/writeBuildNum.sh
+Updated version info.
+
+ 2015-07-03 08:05 hvlad
+ M src/jrd/vio.cpp
+Wrong check, thanks to Claudio
+
+ 2015-07-03 06:45 paulbeach
+ M builds/posix/Makefile.in.extern.editline
+Typo, adjust AR redefinition in extern.editline
+
2015-07-02 15:44 alexpeshkoff
M src/remote/client/interface.cpp
M src/remote/remote.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-03 18:50:48 UTC (rev 61931)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-04 00:12:04 UTC (rev 61932)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31916
+ FORMAL BUILD NUMBER:31920
*/
-#define PRODUCT_VER_STRING "3.0.0.31916"
-#define FILE_VER_STRING "WI-T3.0.0.31916"
-#define LICENSE_VER_STRING "WI-T3.0.0.31916"
-#define FILE_VER_NUMBER 3, 0, 0, 31916
+#define PRODUCT_VER_STRING "3.0.0.31920"
+#define FILE_VER_STRING "WI-V3.0.0.31920"
+#define LICENSE_VER_STRING "WI-V3.0.0.31920"
+#define FILE_VER_NUMBER 3, 0, 0, 31920
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31916"
-#define FB_BUILD_TYPE "T"
-#define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
+#define FB_BUILD_NO "31920"
+#define FB_BUILD_TYPE "V"
+#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-03 18:50:48 UTC (rev 61931)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-04 00:12:04 UTC (rev 61932)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31916
+BuildNum=31920
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...> - 2015-07-06 00:15:09
|
Revision: 61938
http://sourceforge.net/p/firebird/code/61938
Author: firebirds
Date: 2015-07-06 00:15:01 +0000 (Mon, 06 Jul 2015)
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 2015-07-05 22:03:09 UTC (rev 61937)
+++ firebird/trunk/ChangeLog 2015-07-06 00:15:01 UTC (rev 61938)
@@ -1,3 +1,23 @@
+ 2015-07-05 22:03 hvlad
+ M src/jrd/validation.cpp
+Fixed bug CORE-4855 : Online validation during DML activity in other connection leads to message "Error while trying to read from file" and "page in use during flush (210), file: cch.cpp line: 2672"
+
+ 2015-07-05 11:40 alexpeshkoff
+ M src/common/StatusHolder.h
+ M src/common/classes/GetPlugins.h
+ M src/jrd/exe.cpp
+ M src/jrd/status.h
+ M src/jrd/svc.cpp
+Fixed CORE-4861: Segfault when working with saved exception in request
+
+ 2015-07-05 10:36 hvlad
+ M src/jrd/validation.cpp
+Fixed bug CORE-4860 : Online validation fails on WINDOWS if `dbname` argument contains forward slash ('/') and concurrent attachment which also uses '/' exists.
+
+ 2015-07-05 08:47 hvlad
+ M src/common/isc_sync.cpp
+Fixed bug CORE-4859 : FB 3 embedded not working without folder C:\ProgramData\firebird
+
2015-07-03 16:18 asfernandes
M src/dsql/DdlNodes.epp
Fixed CORE-4846 - Altering a trigger indicating other table than the original does not reflect the change.
@@ -3316,7 +3336,8 @@
2014-12-18 10:38 hvlad
M src/common/classes/locks.cpp
M src/common/classes/locks.h
-Patch for mingw by Alexey Pavlov : Fix using function pointer
+Patch for mingw by Alexey Pavlov : Fix using function pointer.
+See also CORE-4619
2014-12-18 10:20 alexpeshkoff
M src/yvalve/gds.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-05 22:03:09 UTC (rev 61937)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-06 00:15:01 UTC (rev 61938)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31920
+ FORMAL BUILD NUMBER:31924
*/
-#define PRODUCT_VER_STRING "3.0.0.31920"
-#define FILE_VER_STRING "WI-V3.0.0.31920"
-#define LICENSE_VER_STRING "WI-V3.0.0.31920"
-#define FILE_VER_NUMBER 3, 0, 0, 31920
+#define PRODUCT_VER_STRING "3.0.0.31924"
+#define FILE_VER_STRING "WI-V3.0.0.31924"
+#define LICENSE_VER_STRING "WI-V3.0.0.31924"
+#define FILE_VER_NUMBER 3, 0, 0, 31924
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31920"
+#define FB_BUILD_NO "31924"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-05 22:03:09 UTC (rev 61937)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-06 00:15:01 UTC (rev 61938)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31920
+BuildNum=31924
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...> - 2015-07-07 00:10:25
|
Revision: 61942
http://sourceforge.net/p/firebird/code/61942
Author: firebirds
Date: 2015-07-07 00:10:23 +0000 (Tue, 07 Jul 2015)
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 2015-07-06 15:10:50 UTC (rev 61941)
+++ firebird/trunk/ChangeLog 2015-07-07 00:10:23 UTC (rev 61942)
@@ -1,3 +1,8 @@
+ 2015-07-06 15:10 hvlad
+ M builds/win32/make_all.bat
+ M builds/win32/set_build_target.bat
+A bit more support for VC12 - make_all now copies CRT dll's into output folder
+
2015-07-05 22:03 hvlad
M src/jrd/validation.cpp
Fixed bug CORE-4855 : Online validation during DML activity in other connection leads to message "Error while trying to read from file" and "page in use during flush (210), file: cch.cpp line: 2672"
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-06 15:10:50 UTC (rev 61941)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-07 00:10:23 UTC (rev 61942)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31924
+ FORMAL BUILD NUMBER:31925
*/
-#define PRODUCT_VER_STRING "3.0.0.31924"
-#define FILE_VER_STRING "WI-V3.0.0.31924"
-#define LICENSE_VER_STRING "WI-V3.0.0.31924"
-#define FILE_VER_NUMBER 3, 0, 0, 31924
+#define PRODUCT_VER_STRING "3.0.0.31925"
+#define FILE_VER_STRING "WI-V3.0.0.31925"
+#define LICENSE_VER_STRING "WI-V3.0.0.31925"
+#define FILE_VER_NUMBER 3, 0, 0, 31925
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31924"
+#define FB_BUILD_NO "31925"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-06 15:10:50 UTC (rev 61941)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-07 00:10:23 UTC (rev 61942)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31924
+BuildNum=31925
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...> - 2015-07-08 00:09:43
|
Revision: 61948
http://sourceforge.net/p/firebird/code/61948
Author: firebirds
Date: 2015-07-08 00:09:40 +0000 (Wed, 08 Jul 2015)
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 2015-07-07 16:02:56 UTC (rev 61947)
+++ firebird/trunk/ChangeLog 2015-07-08 00:09:40 UTC (rev 61948)
@@ -1,3 +1,15 @@
+ 2015-07-07 15:57 asfernandes
+ M src/intl/ld.cpp
+Fixed CORE-4276 - Error on create table with "CHARACTER SET DOS775" field.
+
+ 2015-07-07 13:51 alexpeshkoff
+ M src/dsql/parse.y
+Fixed CORE-4864: CREATE DATABASE fail with ISQL
+
+ 2015-07-07 08:40 paulbeach
+ M configure.ac
+I stand corrected, ia64=so, but can be sl
+
2015-07-06 15:10 hvlad
M builds/win32/make_all.bat
M builds/win32/set_build_target.bat
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-07 16:02:56 UTC (rev 61947)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-08 00:09:40 UTC (rev 61948)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31925
+ FORMAL BUILD NUMBER:31928
*/
-#define PRODUCT_VER_STRING "3.0.0.31925"
-#define FILE_VER_STRING "WI-V3.0.0.31925"
-#define LICENSE_VER_STRING "WI-V3.0.0.31925"
-#define FILE_VER_NUMBER 3, 0, 0, 31925
+#define PRODUCT_VER_STRING "3.0.0.31928"
+#define FILE_VER_STRING "WI-V3.0.0.31928"
+#define LICENSE_VER_STRING "WI-V3.0.0.31928"
+#define FILE_VER_NUMBER 3, 0, 0, 31928
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31925"
+#define FB_BUILD_NO "31928"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-07 16:02:56 UTC (rev 61947)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-08 00:09:40 UTC (rev 61948)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31925
+BuildNum=31928
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...> - 2015-07-09 00:09:46
|
Revision: 61953
http://sourceforge.net/p/firebird/code/61953
Author: firebirds
Date: 2015-07-09 00:09:43 +0000 (Thu, 09 Jul 2015)
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 2015-07-08 12:03:10 UTC (rev 61952)
+++ firebird/trunk/ChangeLog 2015-07-09 00:09:43 UTC (rev 61953)
@@ -1,3 +1,7 @@
+ 2015-07-08 09:56 hvlad
+ M src/jrd/validation.cpp
+Fixed bug CORE-4865 : Online validation could wrongly report double allocated pages
+
2015-07-07 15:57 asfernandes
M src/intl/ld.cpp
Fixed CORE-4276 - Error on create table with "CHARACTER SET DOS775" field.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-08 12:03:10 UTC (rev 61952)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-09 00:09:43 UTC (rev 61953)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31928
+ FORMAL BUILD NUMBER:31929
*/
-#define PRODUCT_VER_STRING "3.0.0.31928"
-#define FILE_VER_STRING "WI-V3.0.0.31928"
-#define LICENSE_VER_STRING "WI-V3.0.0.31928"
-#define FILE_VER_NUMBER 3, 0, 0, 31928
+#define PRODUCT_VER_STRING "3.0.0.31929"
+#define FILE_VER_STRING "WI-V3.0.0.31929"
+#define LICENSE_VER_STRING "WI-V3.0.0.31929"
+#define FILE_VER_NUMBER 3, 0, 0, 31929
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31928"
+#define FB_BUILD_NO "31929"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-08 12:03:10 UTC (rev 61952)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-09 00:09:43 UTC (rev 61953)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31928
+BuildNum=31929
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...> - 2015-07-10 00:08:39
|
Revision: 61961
http://sourceforge.net/p/firebird/code/61961
Author: firebirds
Date: 2015-07-10 00:08:36 +0000 (Fri, 10 Jul 2015)
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 2015-07-09 17:38:57 UTC (rev 61960)
+++ firebird/trunk/ChangeLog 2015-07-10 00:08:36 UTC (rev 61961)
@@ -1,3 +1,11 @@
+ 2015-07-09 17:38 alexpeshkoff
+ M src/common/isc_file.cpp
+Solaris port
+
+ 2015-07-09 17:32 alexpeshkoff
+ M src/jrd/met.epp
+Explanation why this check is needed in both FB3 & 2.5 see in CORE-4869
+
2015-07-08 09:56 hvlad
M src/jrd/validation.cpp
Fixed bug CORE-4865 : Online validation could wrongly report double allocated pages
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-09 17:38:57 UTC (rev 61960)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-10 00:08:36 UTC (rev 61961)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31929
+ FORMAL BUILD NUMBER:31931
*/
-#define PRODUCT_VER_STRING "3.0.0.31929"
-#define FILE_VER_STRING "WI-V3.0.0.31929"
-#define LICENSE_VER_STRING "WI-V3.0.0.31929"
-#define FILE_VER_NUMBER 3, 0, 0, 31929
+#define PRODUCT_VER_STRING "3.0.0.31931"
+#define FILE_VER_STRING "WI-V3.0.0.31931"
+#define LICENSE_VER_STRING "WI-V3.0.0.31931"
+#define FILE_VER_NUMBER 3, 0, 0, 31931
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31929"
+#define FB_BUILD_NO "31931"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-09 17:38:57 UTC (rev 61960)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-10 00:08:36 UTC (rev 61961)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31929
+BuildNum=31931
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...> - 2015-07-10 13:41:13
|
Revision: 61964
http://sourceforge.net/p/firebird/code/61964
Author: alexpeshkoff
Date: 2015-07-10 13:41:10 +0000 (Fri, 10 Jul 2015)
Log Message:
-----------
Fixed CORE-4871: Merge SharedDatabase/SharedCache into single parameter ServerMode, affecting the way how server is started
Modified Paths:
--------------
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/src/common/call_service.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config.h
firebird/trunk/src/jrd/dpm.epp
firebird/trunk/src/jrd/inf.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/os/posix/unix.cpp
firebird/trunk/src/jrd/os/win32/winnt.cpp
firebird/trunk/src/jrd/pag.cpp
firebird/trunk/src/lock/lock.cpp
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2015-07-10 13:41:10 UTC (rev 61964)
@@ -869,16 +869,20 @@
# Settings for Architecture Configuration
# ============================
-
-# Type: boolean
-#SharedCache = true
-
-# Type: boolean
-#SharedDatabase = false
-
-
-# SharedCache SharedDatabase Mode
-# false false Classic with exclusive access // single attachment only ?
-# false true Classic with shared access // traditional CS/SC
-# true false Super with exclusive access // traditional SS
-# true true Super with shared access //
+#
+# Control a method firebird engine is using to work with databases and
+# related firebird server startup parameters.
+#
+# The values are:
+# Super / ThreadedDedicated - databases are opened exclusive by single server process,
+# attachments share single DB pages cache inside process
+# SuperClassic / ThreadedShared - databases are opened by single server process,
+# but it does not prevent opening them in other processes (embedded access),
+# each attachment has it's own DB pages cache
+# Classic / MultiProcess - for each attachment to server separate process is started,
+# each database mauy be opened by mu;tiple processes (including local ones for
+# embedded access), each attachment (process) has it's own DB pages cache
+#
+# Type: string
+#
+#ServerMode = Super
Modified: firebird/trunk/src/common/call_service.cpp
===================================================================
--- firebird/trunk/src/common/call_service.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/common/call_service.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -245,7 +245,7 @@
{
stuffSpb(spb, isc_spb_trusted_auth, "");
}
- if ((!server[0]) && forceLoopback && (!Config::getSharedDatabase()))
+ if ((!server[0]) && forceLoopback && (Config::getServerMode() == MODE_SUPER))
{ // local connection & force & superserver
stuffSpb(spb, isc_spb_config, "Providers=Loopback," CURRENT_ENGINE);
}
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/common/config/config.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -186,8 +186,7 @@
{TYPE_STRING, "UserManager", (ConfigValue) "Srp"},
{TYPE_STRING, "TracePlugin", (ConfigValue) "fbtrace"},
{TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security3.fdb"}, // security database name
- {TYPE_BOOLEAN, "SharedCache", (ConfigValue) true},
- {TYPE_BOOLEAN, "SharedDatabase", (ConfigValue) false},
+ {TYPE_STRING, "ServerMode", (ConfigValue) "Super"},
{TYPE_STRING, "WireCrypt", (ConfigValue) NULL},
{TYPE_STRING, "WireCryptPlugin", (ConfigValue) "Arc4"},
{TYPE_STRING, "KeyHolderPlugin", (ConfigValue) ""},
@@ -424,7 +423,7 @@
SINT64 v = (SINT64) getDefaultConfig()->values[KEY_TEMP_CACHE_LIMIT];
if (v < 0)
{
- v = getSharedDatabase() ? 8388608 : 67108864; // bytes
+ v = getServerMode() != MODE_SUPER ? 8388608 : 67108864; // bytes
}
return v;
}
@@ -469,7 +468,7 @@
int rc = get<int>(KEY_DEFAULT_DB_CACHE_PAGES);
if (rc < 0)
{
- rc = getSharedDatabase() ? 256 : 2048; // pages
+ rc = getServerMode() != MODE_SUPER ? 256 : 2048; // pages
}
return rc;
}
@@ -636,7 +635,7 @@
if (! rc)
{
- rc = getSharedCache() ? GCPolicyCombined : GCPolicyCooperative;
+ rc = getServerMode() == MODE_SUPER ? GCPolicyCombined : GCPolicyCooperative;
}
return rc;
@@ -678,14 +677,27 @@
return (FB_UINT64)(SINT64) getDefaultConfig()->values[KEY_MAX_TRACELOG_SIZE];
}
-bool Config::getSharedCache()
+int Config::getServerMode()
{
- return (bool) getDefaultConfig()->values[KEY_SHARED_CACHE];
-}
+ static int rc = -1;
+ if (rc >= 0)
+ return rc;
-bool Config::getSharedDatabase()
-{
- return (bool) getDefaultConfig()->values[KEY_SHARED_DATABASE];
+ const char* textMode = (const char*) (getDefaultConfig()->values[KEY_SERVER_MODE]);
+ const char* modes[6] =
+ {"Super", "ThreadedDedicated", "SuperClassic", "ThreadedShared", "Classic", "MultiProcess"};
+ for (int x = 0; x < 6; ++x)
+ {
+ if (fb_utils::stricmp(textMode, modes[x]) == 0)
+ {
+ rc = x / 2;
+ return rc;
+ }
+ }
+
+ // use default
+ rc = MODE_SUPER;
+ return rc;
}
const char* Config::getPlugins(unsigned int type) const
Modified: firebird/trunk/src/common/config/config.h
===================================================================
--- firebird/trunk/src/common/config/config.h 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/common/config/config.h 2015-07-10 13:41:10 UTC (rev 61964)
@@ -75,6 +75,10 @@
enum WireCryptMode {WC_CLIENT, WC_SERVER}; // Have different defaults
+const int MODE_SUPER = 0;
+const int MODE_SUPERCLASSIC = 1;
+const int MODE_CLASSIC = 2;
+
const char* const CONFIG_FILE = "firebird.conf";
class Config : public Firebird::RefCounted, public Firebird::GlobalStorage
@@ -129,8 +133,7 @@
KEY_PLUG_AUTH_MANAGE,
KEY_PLUG_TRACE,
KEY_SECURITY_DATABASE,
- KEY_SHARED_CACHE,
- KEY_SHARED_DATABASE,
+ KEY_SERVER_MODE,
KEY_WIRE_CRYPT,
KEY_PLUG_WIRE_CRYPT,
KEY_PLUG_KEY_HOLDER,
@@ -329,10 +332,8 @@
static FB_UINT64 getMaxUserTraceLogSize();
- static bool getSharedCache();
+ static int getServerMode();
- static bool getSharedDatabase();
-
const char* getPlugins(unsigned int type) const;
const char* getSecurityDatabase() const;
Modified: firebird/trunk/src/jrd/dpm.epp
===================================================================
--- firebird/trunk/src/jrd/dpm.epp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/jrd/dpm.epp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -3118,7 +3118,7 @@
// Make few tries to lock consecutive data pages without waiting. In highly
// concurrent environment with shared page cache it could be faster than wait
// in OS for first candidate page.
- int tries = dbb->dbb_config->getSharedCache() ? 8 : 0;
+ int tries = dbb->dbb_config->getServerMode() != MODE_SUPER ? 8 : 0;
ULONG pp_sequence =
(type == DPM_primary ? relPages->rel_pri_data_space : relPages->rel_sec_data_space);
Modified: firebird/trunk/src/jrd/inf.cpp
===================================================================
--- firebird/trunk/src/jrd/inf.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/jrd/inf.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -718,7 +718,7 @@
case isc_info_db_class:
length = INF_convert(
- (dbb->dbb_config->getSharedDatabase() ?
+ (dbb->dbb_config->getServerMode() != MODE_SUPER ?
isc_info_db_class_classic_access : isc_info_db_class_server_access),
buffer);
break;
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/jrd/jrd.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -1545,7 +1545,7 @@
// Here we do not let anyone except SYSDBA (like DBO) to change dbb_page_buffers,
// cause other flags is UserId can be set only when DB is opened.
// No idea how to test for other cases before init is complete.
- if (config->getSharedDatabase() ? userId.locksmith() : true)
+ if ((config->getServerMode() != MODE_SUPER) || userId.locksmith())
dbb->dbb_page_buffers = options.dpb_page_buffers;
}
@@ -5656,7 +5656,7 @@
break;
case isc_dpb_num_buffers:
- if (!Config::getSharedCache())
+ if (Config::getServerMode() != MODE_SUPER)
{
dpb_buffers = rdr.getInt();
const unsigned TEMP_LIMIT = 25;
@@ -6037,15 +6037,8 @@
{ // scope
MutexLockGuard listGuard(databases_mutex, FB_FUNCTION);
- if (config->getSharedCache())
+ if (config->getServerMode() == MODE_SUPER)
{
- if (config->getSharedDatabase())
- {
- const char* const errorMsg =
- "SharedDatabase and SharedCache settings cannot be both enabled at once";
- ERR_post(Arg::Gds(isc_wish_list) << Arg::Gds(isc_random) << Arg::Str(errorMsg));
- }
-
shared = true;
dbb = databases;
@@ -6342,7 +6335,7 @@
dbb->dbb_extManager.closeAttachment(tdbb, attachment);
- if (!dbb->dbb_config->getSharedDatabase() && attachment->att_relations)
+ if ((dbb->dbb_config->getServerMode() == MODE_SUPER) && attachment->att_relations)
{
vec<jrd_rel*>& rels = *attachment->att_relations;
for (FB_SIZE_T i = 1; i < rels.count(); i++)
@@ -6544,7 +6537,7 @@
if ((flags & SHUT_DBB_LINGER) &&
(!(engineShutdown || (dbb->dbb_ast_flags & DBB_shutdown))) &&
(dbb->dbb_linger_seconds > 0) &&
- (MasterInterfacePtr()->serverMode(-1) == 1) && // multiuser server
+ (dbb->dbb_config->getServerMode() != MODE_CLASSIC) &&
(dbb->dbb_flags & DBB_shared))
{
if (!dbb->dbb_linger_timer)
Modified: firebird/trunk/src/jrd/os/posix/unix.cpp
===================================================================
--- firebird/trunk/src/jrd/os/posix/unix.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/jrd/os/posix/unix.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -222,7 +222,7 @@
Arg::Gds(isc_io_create_err) << Arg::Unix(errno));
}
- const bool shareMode = dbb->dbb_config->getSharedDatabase();
+ const bool shareMode = dbb->dbb_config->getServerMode() != MODE_SUPER;
if (!lockDatabaseFile(desc, shareMode, temporary))
{
int lockErrno = errno;
@@ -665,7 +665,7 @@
dbb->dbb_flags |= DBB_being_opened_read_only;
}
- const bool shareMode = dbb->dbb_config->getSharedDatabase();
+ const bool shareMode = dbb->dbb_config->getServerMode() != MODE_SUPER;
if (!lockDatabaseFile(desc, shareMode || readOnly))
{
ERR_post(Arg::Gds(isc_io_error) << Arg::Str("lock") << Arg::Str(file_name) <<
Modified: firebird/trunk/src/jrd/os/win32/winnt.cpp
===================================================================
--- firebird/trunk/src/jrd/os/win32/winnt.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/jrd/os/win32/winnt.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -221,7 +221,7 @@
adjustFsCacheOnce.init();
const TEXT* file_name = string.c_str();
- const bool shareMode = dbb->dbb_config->getSharedDatabase();
+ const bool shareMode = dbb->dbb_config->getServerMode() != MODE_SUPER;
DWORD dwShareMode = getShareFlags(shareMode, temporary);
@@ -543,7 +543,7 @@
**************************************/
const TEXT* const ptr = (string.hasData() ? string : file_name).c_str();
bool readOnly = false;
- const bool shareMode = dbb->dbb_config->getSharedDatabase();
+ const bool shareMode = dbb->dbb_config->getServerMode() != MODE_SUPER;
adjustFsCacheOnce.init();
Modified: firebird/trunk/src/jrd/pag.cpp
===================================================================
--- firebird/trunk/src/jrd/pag.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/jrd/pag.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -2285,7 +2285,7 @@
fb_assert(tempPageSpaceID == 0);
- if (dbb->dbb_config->getSharedDatabase())
+ if (dbb->dbb_config->getServerMode() != MODE_SUPER)
{
Jrd::Attachment* const attachment = tdbb->getAttachment();
Modified: firebird/trunk/src/lock/lock.cpp
===================================================================
--- firebird/trunk/src/lock/lock.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/lock/lock.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -219,7 +219,7 @@
m_config(conf),
m_acquireSpins(m_config->getLockAcquireSpins()),
m_memorySize(m_config->getLockMemSize()),
- m_useBlockingThread(m_config->getSharedDatabase())
+ m_useBlockingThread(m_config->getServerMode() != MODE_SUPER)
#ifdef USE_SHMEM_EXT
, m_extents(getPool())
#endif
Modified: firebird/trunk/src/remote/server/os/posix/inet_server.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/posix/inet_server.cpp 2015-07-10 13:06:45 UTC (rev 61963)
+++ firebird/trunk/src/remote/server/os/posix/inet_server.cpp 2015-07-10 13:41:10 UTC (rev 61964)
@@ -203,20 +203,6 @@
debug = true;
break;
- case 'S':
- if (!classic)
- {
- standaloneClassic = true;
- }
- break;
-
- case 'I':
- if (!classic)
- {
- standaloneClassic = false;
- }
- break;
-
case 'E':
if (argv < end)
{
@@ -254,8 +240,6 @@
case '?':
printf("Firebird TCP/IP server options are:\n");
printf(" -d : debug on\n");
- printf(" -s : standalone - true\n");
- printf(" -i : standalone - false\n");
printf(" -p <port> : specify port to listen on\n");
printf(" -z : print version and exit\n");
printf(" -h|? : print this help\n");
@@ -281,8 +265,18 @@
}
}
- if (!(classic || standaloneClassic))
+ if (Config::getServerMode() == MODE_CLASSIC)
{
+ if (!classic)
+ standaloneClassic = true;
+ }
+ else
+ {
+ if (classic)
+ {
+ gds__log("Server misconfigured - to start it from (x)inetd add ServerMode=Classic to firebird.conf");
+ exit(STARTUP_ERROR);
+ }
INET_SERVER_flag |= SRVR_multi_client;
super = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-07-11 00:09:24
|
Revision: 61968
http://sourceforge.net/p/firebird/code/61968
Author: firebirds
Date: 2015-07-11 00:09:22 +0000 (Sat, 11 Jul 2015)
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 2015-07-10 20:35:28 UTC (rev 61967)
+++ firebird/trunk/ChangeLog 2015-07-11 00:09:22 UTC (rev 61968)
@@ -1,3 +1,24 @@
+ 2015-07-10 16:19 asfernandes
+ M src/jrd/IntlManager.cpp
+ M src/jrd/IntlManager.h
+ M src/jrd/jrd.cpp
+Fixed CORE-4277 - Can create database with invalid character set.
+
+ 2015-07-10 13:41 alexpeshkoff
+ M builds/install/misc/firebird.conf.in
+ M src/common/call_service.cpp
+ M src/common/config/config.cpp
+ M src/common/config/config.h
+ M src/jrd/dpm.epp
+ M src/jrd/inf.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/os/posix/unix.cpp
+ M src/jrd/os/win32/winnt.cpp
+ M src/jrd/pag.cpp
+ M src/lock/lock.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+Fixed CORE-4871: Merge SharedDatabase/SharedCache into single parameter ServerMode, affecting the way how server is started
+
2015-07-09 17:38 alexpeshkoff
M src/common/isc_file.cpp
Solaris port
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-10 20:35:28 UTC (rev 61967)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-11 00:09:22 UTC (rev 61968)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31931
+ FORMAL BUILD NUMBER:31933
*/
-#define PRODUCT_VER_STRING "3.0.0.31931"
-#define FILE_VER_STRING "WI-V3.0.0.31931"
-#define LICENSE_VER_STRING "WI-V3.0.0.31931"
-#define FILE_VER_NUMBER 3, 0, 0, 31931
+#define PRODUCT_VER_STRING "3.0.0.31933"
+#define FILE_VER_STRING "WI-V3.0.0.31933"
+#define LICENSE_VER_STRING "WI-V3.0.0.31933"
+#define FILE_VER_NUMBER 3, 0, 0, 31933
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31931"
+#define FB_BUILD_NO "31933"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-10 20:35:28 UTC (rev 61967)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-11 00:09:22 UTC (rev 61968)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31931
+BuildNum=31933
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...> - 2015-07-12 20:10:51
|
Revision: 61971
http://sourceforge.net/p/firebird/code/61971
Author: asfernandes
Date: 2015-07-12 20:10:49 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/jrd/trace/TraceManager.cpp
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2015-07-12 17:54:11 UTC (rev 61970)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2015-07-12 20:10:49 UTC (rev 61971)
@@ -870,18 +870,18 @@
# ============================
#
-# Control a method firebird engine is using to work with databases and
-# related firebird server startup parameters.
+# Controls the method Firebird engine uses to work with databases and
+# related Firebird server startup parameters.
#
# The values are:
# Super / ThreadedDedicated - databases are opened exclusive by single server process,
# attachments share single DB pages cache inside process
# SuperClassic / ThreadedShared - databases are opened by single server process,
# but it does not prevent opening them in other processes (embedded access),
-# each attachment has it's own DB pages cache
-# Classic / MultiProcess - for each attachment to server separate process is started,
-# each database mauy be opened by mu;tiple processes (including local ones for
-# embedded access), each attachment (process) has it's own DB pages cache
+# each attachment has its own DB pages cache
+# Classic / MultiProcess - for each attachment to server a separate process is started,
+# each database may be opened by multiple processes (including local ones for
+# embedded access), each attachment (process) has its own DB pages cache
#
# Type: string
#
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2015-07-12 17:54:11 UTC (rev 61970)
+++ firebird/trunk/src/common/config/config.cpp 2015-07-12 20:10:49 UTC (rev 61971)
@@ -686,6 +686,7 @@
const char* textMode = (const char*) (getDefaultConfig()->values[KEY_SERVER_MODE]);
const char* modes[6] =
{"Super", "ThreadedDedicated", "SuperClassic", "ThreadedShared", "Classic", "MultiProcess"};
+
for (int x = 0; x < 6; ++x)
{
if (fb_utils::stricmp(textMode, modes[x]) == 0)
Modified: firebird/trunk/src/jrd/trace/TraceManager.cpp
===================================================================
--- firebird/trunk/src/jrd/trace/TraceManager.cpp 2015-07-12 17:54:11 UTC (rev 61970)
+++ firebird/trunk/src/jrd/trace/TraceManager.cpp 2015-07-12 20:10:49 UTC (rev 61971)
@@ -230,6 +230,7 @@
string s_user = session.ses_user;
string t_role;
+
if (session.ses_auth.hasData())
{
Database* dbb = attachment->att_database;
@@ -242,11 +243,12 @@
dbb->dbb_config->getSecurityDatabase(),
dbb->dbb_provider->getCryptCallback());
}
- catch(const Firebird::Exception&)
+ catch (const Firebird::Exception&)
{
// Error in mapUser() means missing context, therefore...
return;
}
+
t_role.upper();
}
@@ -260,6 +262,7 @@
{
string s_user = session.ses_user;
string t_role;
+
if (session.ses_auth.hasData())
{
PathName dummy;
@@ -271,11 +274,12 @@
mapUser(s_user, t_role, NULL, NULL, session.ses_auth, "services manager", NULL,
config->getSecurityDatabase(), service->getCryptCallback());
}
- catch(const Firebird::Exception&)
+ catch (const Firebird::Exception&)
{
// Error in mapUser() means missing context, therefore...
return;
}
+
t_role.upper();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2015-07-12 21:16:36
|
Revision: 61972
http://sourceforge.net/p/firebird/code/61972
Author: asfernandes
Date: 2015-07-12 21:16:33 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
Fixed CORE-4279 - Invalid error message: "CHARACTER SET OCTETS is not defined" on db creation with isc_dpb_lc_ctype = OCTETS.
Modified Paths:
--------------
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/jrd/jrd.cpp
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 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2015-07-12 21:16:33 UTC (rev 61972)
@@ -1618,6 +1618,8 @@
PARAMETER (GDS__savepoint_backout_err = 335545102)
INTEGER*4 GDS__domain_primary_key_notnull
PARAMETER (GDS__domain_primary_key_notnull = 335545103)
+ INTEGER*4 GDS__invalid_attachment_charset
+ PARAMETER (GDS__invalid_attachment_charset = 335545104)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2015-07-12 21:16:33 UTC (rev 61972)
@@ -816,6 +816,7 @@
gds_fun_param_mismatch = 335545101;
gds_savepoint_backout_err = 335545102;
gds_domain_primary_key_notnull = 335545103;
+ gds_invalid_attachment_charset = 335545104;
gds_gfix_db_name = 335740929;
gds_gfix_invalid_sw = 335740930;
gds_gfix_incmp_sw = 335740932;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/include/gen/codetext.h 2015-07-12 21:16:33 UTC (rev 61972)
@@ -805,6 +805,7 @@
{"fun_param_mismatch", 335545101},
{"savepoint_backout_err", 335545102},
{"domain_primary_key_notnull", 335545103},
+ {"invalid_attachment_charset", 335545104},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/include/gen/iberror.h 2015-07-12 21:16:33 UTC (rev 61972)
@@ -839,6 +839,7 @@
const ISC_STATUS isc_fun_param_mismatch = 335545101L;
const ISC_STATUS isc_savepoint_backout_err = 335545102L;
const ISC_STATUS isc_domain_primary_key_notnull = 335545103L;
+const ISC_STATUS isc_invalid_attachment_charset = 335545104L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1299,7 +1300,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 = 1243;
+const ISC_STATUS isc_err_max = 1244;
#else /* c definitions */
@@ -2108,6 +2109,7 @@
#define isc_fun_param_mismatch 335545101L
#define isc_savepoint_backout_err 335545102L
#define isc_domain_primary_key_notnull 335545103L
+#define isc_invalid_attachment_charset 335545104L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2568,7 +2570,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 1243
+#define isc_err_max 1244
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/include/gen/msgs.h 2015-07-12 21:16:33 UTC (rev 61972)
@@ -808,6 +808,7 @@
{335545101, "Input parameter mismatch for function @1"}, /* fun_param_mismatch */
{335545102, "Error during savepoint backout - transaction invalidated"}, /* savepoint_backout_err */
{335545103, "Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL"}, /* domain_primary_key_notnull */
+ {335545104, "CHARACTER SET @1 cannot be used as a attachment character set"}, /* invalid_attachment_charset */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/include/gen/sql_code.h 2015-07-12 21:16:33 UTC (rev 61972)
@@ -804,6 +804,7 @@
{335545101, -170}, /* 781 fun_param_mismatch */
{335545102, -901}, /* 782 savepoint_backout_err */
{335545103, -291}, /* 783 domain_primary_key_notnull */
+ {335545104, -204}, /* 784 invalid_attachment_charset */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/include/gen/sql_state.h 2015-07-12 21:16:33 UTC (rev 61972)
@@ -804,6 +804,7 @@
{335545101, "07001"}, // 781 fun_param_mismatch
{335545102, "HY000"}, // 782 savepoint_backout_err
{335545103, "42000"}, // 783 domain_primary_key_notnull
+ {335545104, "2C000"}, // 784 invalid_attachment_charset
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/jrd/jrd.cpp 2015-07-12 21:16:33 UTC (rev 61972)
@@ -5574,13 +5574,18 @@
}
USHORT id;
-
const UCHAR* lc_ctype = reinterpret_cast<const UCHAR*>(options->dpb_lc_ctype.c_str());
if (MET_get_char_coll_subtype(tdbb, &id, lc_ctype, options->dpb_lc_ctype.length()) &&
- INTL_defined_type(tdbb, id & 0xFF) && ((id & 0xFF) != CS_BINARY))
+ INTL_defined_type(tdbb, id & 0xFF))
{
- attachment->att_client_charset = attachment->att_charset = id & 0xFF;
+ if ((id & 0xFF) == CS_BINARY)
+ {
+ ERR_post(Arg::Gds(isc_bad_dpb_content) <<
+ Arg::Gds(isc_invalid_attachment_charset) << Arg::Str(options->dpb_lc_ctype));
+ }
+ else
+ attachment->att_client_charset = attachment->att_charset = id & 0xFF;
}
else
{
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/msgs/facilities2.sql 2015-07-12 21:16:33 UTC (rev 61972)
@@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
-('2015-04-13 14:50:00', 'JRD', 0, 784)
+('2015-07-12 18:05:00', 'JRD', 0, 785)
('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)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/msgs/messages2.sql 2015-07-12 21:16:33 UTC (rev 61972)
@@ -891,6 +891,7 @@
('fun_param_mismatch', 'UdfCallNode::dsqlPass', 'ExprNode.cpp', NULL, 0, 781, NULL, 'Input parameter mismatch for function @1', NULL, NULL);
('savepoint_backout_err', 'VIO_verb_cleanup', 'vio.cpp', NULL, 0, 782, NULL, 'Error during savepoint backout - transaction invalidated', NULL, NULL);
('domain_primary_key_notnull', NULL, 'DdlNodes.epp', NULL, 0, 783, NULL, 'Domain used in the PRIMARY KEY constraint of table @1 must be NOT NULL', NULL, NULL);
+('invalid_attachment_charset', NULL, NULL, NULL, 0, 784, NULL, 'CHARACTER SET @1 cannot be used as a attachment character set', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2015-07-12 20:10:49 UTC (rev 61971)
+++ firebird/trunk/src/msgs/system_errors2.sql 2015-07-12 21:16:33 UTC (rev 61972)
@@ -790,6 +790,7 @@
(-170, '07', '001', 0, 781, 'fun_param_mismatch', NULL, NULL)
(-901, 'HY', '000', 0, 782, 'savepoint_backout_err', NULL, NULL)
(-291, '42', '000', 0, 783, 'domain_primary_key_notnull', NULL, NULL)
+(-204, '2C', '000', 0, 784, 'invalid_attachment_charset', NULL, NULL)
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-07-13 00:09:09
|
Revision: 61973
http://sourceforge.net/p/firebird/code/61973
Author: firebirds
Date: 2015-07-13 00:09:06 +0000 (Mon, 13 Jul 2015)
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 2015-07-12 21:16:33 UTC (rev 61972)
+++ firebird/trunk/ChangeLog 2015-07-13 00:09:06 UTC (rev 61973)
@@ -1,3 +1,28 @@
+ 2015-07-12 21:16 asfernandes
+ 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/jrd/jrd.cpp
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+Fixed CORE-4279 - Invalid error message: "CHARACTER SET OCTETS is not defined" on db creation with isc_dpb_lc_ctype = OCTETS.
+
+ 2015-07-12 20:10 asfernandes
+ M builds/install/misc/firebird.conf.in
+ M src/common/config/config.cpp
+ M src/jrd/trace/TraceManager.cpp
+Misc.
+
+ 2015-07-12 17:54 dimitr
+ M src/jrd/RecordSourceNodes.cpp
+ M src/jrd/RecordSourceNodes.h
+Fixed CORE-4107: wrong resultset (subquery + derived table + union).
+
2015-07-10 16:19 asfernandes
M src/jrd/IntlManager.cpp
M src/jrd/IntlManager.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-12 21:16:33 UTC (rev 61972)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-13 00:09:06 UTC (rev 61973)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31933
+ FORMAL BUILD NUMBER:31936
*/
-#define PRODUCT_VER_STRING "3.0.0.31933"
-#define FILE_VER_STRING "WI-V3.0.0.31933"
-#define LICENSE_VER_STRING "WI-V3.0.0.31933"
-#define FILE_VER_NUMBER 3, 0, 0, 31933
+#define PRODUCT_VER_STRING "3.0.0.31936"
+#define FILE_VER_STRING "WI-V3.0.0.31936"
+#define LICENSE_VER_STRING "WI-V3.0.0.31936"
+#define FILE_VER_NUMBER 3, 0, 0, 31936
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31933"
+#define FB_BUILD_NO "31936"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-12 21:16:33 UTC (rev 61972)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-13 00:09:06 UTC (rev 61973)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31933
+BuildNum=31936
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...> - 2015-07-14 00:09:44
|
Revision: 61981
http://sourceforge.net/p/firebird/code/61981
Author: firebirds
Date: 2015-07-14 00:09:42 +0000 (Tue, 14 Jul 2015)
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 2015-07-13 19:42:26 UTC (rev 61980)
+++ firebird/trunk/ChangeLog 2015-07-14 00:09:42 UTC (rev 61981)
@@ -1,3 +1,19 @@
+ 2015-07-13 19:42 hvlad
+ M src/gpre/boot/gpre_meta_boot.cpp
+Fixed gpre_boot compilation
+
+ 2015-07-13 19:30 hvlad
+ M src/gpre/gpre.cpp
+This avoids gpre hung on exit if worker database have non-zero LINGER set.
+
+ 2015-07-13 15:55 alexpeshkoff
+ M src/alice/exe.cpp
+Fixed CORE-3548: GFIX returns an error after correctly shutting down a database
+
+ 2015-07-13 12:47 alexpeshkoff
+ M src/remote/os/win32/xnet.cpp
+Do not use ancient "Connection lost to pipe server" message in local connections
+
2015-07-12 21:16 asfernandes
M lang_helpers/gds_codes.ftn
M lang_helpers/gds_codes.pas
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-13 19:42:26 UTC (rev 61980)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-14 00:09:42 UTC (rev 61981)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31936
+ FORMAL BUILD NUMBER:31940
*/
-#define PRODUCT_VER_STRING "3.0.0.31936"
-#define FILE_VER_STRING "WI-V3.0.0.31936"
-#define LICENSE_VER_STRING "WI-V3.0.0.31936"
-#define FILE_VER_NUMBER 3, 0, 0, 31936
+#define PRODUCT_VER_STRING "3.0.0.31940"
+#define FILE_VER_STRING "WI-V3.0.0.31940"
+#define LICENSE_VER_STRING "WI-V3.0.0.31940"
+#define FILE_VER_NUMBER 3, 0, 0, 31940
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31936"
+#define FB_BUILD_NO "31940"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-13 19:42:26 UTC (rev 61980)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-14 00:09:42 UTC (rev 61981)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31936
+BuildNum=31940
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...> - 2015-07-15 00:08:46
|
Revision: 61992
http://sourceforge.net/p/firebird/code/61992
Author: firebirds
Date: 2015-07-15 00:08:44 +0000 (Wed, 15 Jul 2015)
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 2015-07-14 19:09:30 UTC (rev 61991)
+++ firebird/trunk/ChangeLog 2015-07-15 00:08:44 UTC (rev 61992)
@@ -1,3 +1,11 @@
+ 2015-07-14 17:10 dimitr
+ M src/jrd/RecordSourceNodes.cpp
+Fixed CORE-4710: invalid request BLR at offset 361 context already in use (BLR error).
+
+ 2015-07-14 16:00 asfernandes
+ M src/dsql/Parser.cpp
+Rework on CORE-4781 - Maximum string length (32767 bytes) is not validated.
+
2015-07-13 19:42 hvlad
M src/gpre/boot/gpre_meta_boot.cpp
Fixed gpre_boot compilation
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-14 19:09:30 UTC (rev 61991)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-15 00:08:44 UTC (rev 61992)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31940
+ FORMAL BUILD NUMBER:31942
*/
-#define PRODUCT_VER_STRING "3.0.0.31940"
-#define FILE_VER_STRING "WI-V3.0.0.31940"
-#define LICENSE_VER_STRING "WI-V3.0.0.31940"
-#define FILE_VER_NUMBER 3, 0, 0, 31940
+#define PRODUCT_VER_STRING "3.0.0.31942"
+#define FILE_VER_STRING "WI-V3.0.0.31942"
+#define LICENSE_VER_STRING "WI-V3.0.0.31942"
+#define FILE_VER_NUMBER 3, 0, 0, 31942
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31940"
+#define FB_BUILD_NO "31942"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-14 19:09:30 UTC (rev 61991)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-15 00:08:44 UTC (rev 61992)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31940
+BuildNum=31942
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...> - 2015-07-16 00:08:58
|
Revision: 62005
http://sourceforge.net/p/firebird/code/62005
Author: firebirds
Date: 2015-07-16 00:08:56 +0000 (Thu, 16 Jul 2015)
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 2015-07-15 20:54:10 UTC (rev 62004)
+++ firebird/trunk/ChangeLog 2015-07-16 00:08:56 UTC (rev 62005)
@@ -1,3 +1,31 @@
+ 2015-07-15 15:16 alexpeshkoff
+ M src/jrd/jrd.cpp
+Postfix for CORE-4811: fix handling case for OS names
+
+ 2015-07-15 14:14 hvlad
+ M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+Fixed bug CORE-4876
+fbsvcmgr shows wrong options for some Trace API services in help screen
+
+ 2015-07-15 12:07 dimitr
+ M src/remote/client/BlrFromMessage.cpp
+ M src/remote/client/BlrFromMessage.h
+ M src/remote/client/interface.cpp
+This should fix CORE-4872: v3 fbclient cannot work with servers older than v2.5 via the remote protocol.
+
+ 2015-07-15 11:10 hvlad
+ M src/jrd/dpm.epp
+Correction
+
+ 2015-07-15 10:55 hvlad
+ M src/utilities/gsec/main/gsecMain.cpp
+gsec also could hung on exit if worker database have non-zero LINGER set.
+Seems we must add fb_shutdown to the every utility which could load embedded engine...
+
+ 2015-07-15 10:42 hvlad
+ M src/remote/server/os/win32/srvr_w32.cpp
+Windows-specific part for CORE-4871
+
2015-07-14 17:10 dimitr
M src/jrd/RecordSourceNodes.cpp
Fixed CORE-4710: invalid request BLR at offset 361 context already in use (BLR error).
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-07-15 20:54:10 UTC (rev 62004)
+++ firebird/trunk/src/jrd/build_no.h 2015-07-16 00:08:56 UTC (rev 62005)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31942
+ FORMAL BUILD NUMBER:31948
*/
-#define PRODUCT_VER_STRING "3.0.0.31942"
-#define FILE_VER_STRING "WI-V3.0.0.31942"
-#define LICENSE_VER_STRING "WI-V3.0.0.31942"
-#define FILE_VER_NUMBER 3, 0, 0, 31942
+#define PRODUCT_VER_STRING "3.0.0.31948"
+#define FILE_VER_STRING "WI-V3.0.0.31948"
+#define LICENSE_VER_STRING "WI-V3.0.0.31948"
+#define FILE_VER_NUMBER 3, 0, 0, 31948
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31942"
+#define FB_BUILD_NO "31948"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-07-15 20:54:10 UTC (rev 62004)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-07-16 00:08:56 UTC (rev 62005)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31942
+BuildNum=31948
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...> - 2015-07-27 01:06:53
|
Revision: 62047
http://sourceforge.net/p/firebird/code/62047
Author: asfernandes
Date: 2015-07-27 01:06:51 +0000 (Mon, 27 Jul 2015)
Log Message:
-----------
Fixed CORE-4881 - Increase maximum string literal length to 64K (bytes) while setting a lower limit (of characters) for multibyte charsets based on their max char. length (UTF-8 literals will be limited to 16383 characters).
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/Parser.cpp
firebird/trunk/src/dsql/gen.cpp
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/jrd/DataTypeUtil.cpp
firebird/trunk/src/jrd/SysFunction.cpp
firebird/trunk/src/jrd/blb.cpp
firebird/trunk/src/jrd/constants.h
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
firebird/trunk/src/yvalve/gds.cpp
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2015-07-27 01:06:51 UTC (rev 62047)
@@ -2334,8 +2334,10 @@
PARAMETER (GDS__dsql_wlock_conflict = 336397329)
INTEGER*4 GDS__dsql_max_exception_arguments
PARAMETER (GDS__dsql_max_exception_arguments = 336397330)
- INTEGER*4 GDS__dsql_string_length
- PARAMETER (GDS__dsql_string_length = 336397331)
+ INTEGER*4 GDS__dsql_string_byte_length
+ PARAMETER (GDS__dsql_string_byte_length = 336397331)
+ INTEGER*4 GDS__dsql_string_char_length
+ PARAMETER (GDS__dsql_string_char_length = 336397332)
INTEGER*4 GDS__gsec_cant_open_db
PARAMETER (GDS__gsec_cant_open_db = 336723983)
INTEGER*4 GDS__gsec_switches_error
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1174,7 +1174,8 @@
gds_dsql_wlock_aggregates = 336397328;
gds_dsql_wlock_conflict = 336397329;
gds_dsql_max_exception_arguments = 336397330;
- gds_dsql_string_length = 336397331;
+ gds_dsql_string_byte_length = 336397331;
+ gds_dsql_string_char_length = 336397332;
gds_gsec_cant_open_db = 336723983;
gds_gsec_switches_error = 336723984;
gds_gsec_no_op_spec = 336723985;
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -3158,7 +3158,7 @@
if (value1->dsc_dtype == dtype_dbkey && value2->dsc_dtype == dtype_dbkey)
{
- if ((ULONG) value1->dsc_length + (ULONG) value2->dsc_length > MAX_COLUMN_SIZE - sizeof(USHORT))
+ if ((ULONG) value1->dsc_length + (ULONG) value2->dsc_length > MAX_STR_SIZE)
{
ERR_post(Arg::Gds(isc_concat_overflow));
return NULL;
@@ -3210,7 +3210,7 @@
{
fb_assert(desc.dsc_dtype == dtype_varying);
- if ((ULONG) length1 + (ULONG) length2 > MAX_COLUMN_SIZE - sizeof(USHORT))
+ if ((ULONG) length1 + (ULONG) length2 > MAX_STR_SIZE)
{
ERR_post(Arg::Gds(isc_concat_overflow));
return NULL;
@@ -6483,9 +6483,19 @@
}
else
{
- constant->litDesc.dsc_length =
- charSet->length(dsqlStr->getString().length(), constant->litDesc.dsc_address, true) *
- charSet->maxBytesPerChar();
+ ULONG charLength = charSet->length(
+ dsqlStr->getString().length(), constant->litDesc.dsc_address, true);
+
+ if (charLength > MAX_STR_SIZE / charSet->maxBytesPerChar())
+ {
+ ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+ Arg::Gds(isc_dsql_string_char_length) <<
+ Arg::Num(charLength) <<
+ Arg::Num(MAX_STR_SIZE / charSet->maxBytesPerChar()) <<
+ METD_get_charset_name(dsqlScratch->getTransaction(), constant->litDesc.getCharSet()));
+ }
+ else
+ constant->litDesc.dsc_length = charLength * charSet->maxBytesPerChar();
}
constant->litDesc.dsc_length += adjust;
@@ -9769,8 +9779,8 @@
ULONG start = (ULONG) sStart;
ULONG length = (ULONG) sLength;
- if (desc.isText() && length > MAX_COLUMN_SIZE)
- length = MAX_COLUMN_SIZE;
+ if (desc.isText() && length > MAX_STR_SIZE)
+ length = MAX_STR_SIZE;
ULONG dataLen;
@@ -9888,7 +9898,7 @@
CharSet* charSet = INTL_charset_lookup(tdbb, desc.getCharSet());
desc.dsc_address = NULL;
- const ULONG totLen = MIN(MAX_COLUMN_SIZE, length * charSet->maxBytesPerChar());
+ const ULONG totLen = MIN(MAX_STR_SIZE, length * charSet->maxBytesPerChar());
desc.dsc_length = totLen;
EVL_make_value(tdbb, &desc, impure);
Modified: firebird/trunk/src/dsql/Parser.cpp
===================================================================
--- firebird/trunk/src/dsql/Parser.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/dsql/Parser.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -484,15 +484,15 @@
*p = *lex.ptr++;
}
- if (p - buffer > MAX_COLUMN_SIZE)
+ if (p - buffer > MAX_STR_SIZE)
{
if (buffer != string)
gds__free (buffer);
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- Arg::Gds(isc_dsql_string_length) <<
+ Arg::Gds(isc_dsql_string_byte_length) <<
Arg::Num(p - buffer) <<
- Arg::Num(MAX_COLUMN_SIZE));
+ Arg::Num(MAX_STR_SIZE));
}
if (c == '"')
@@ -666,12 +666,12 @@
byte = c;
}
- if (temp.length() > MAX_COLUMN_SIZE)
+ if (temp.length() / 2 > MAX_STR_SIZE)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- Arg::Gds(isc_dsql_string_length) <<
- Arg::Num(temp.length()) <<
- Arg::Num(MAX_COLUMN_SIZE));
+ Arg::Gds(isc_dsql_string_byte_length) <<
+ Arg::Num(temp.length() / 2) <<
+ Arg::Num(MAX_STR_SIZE));
}
yylval.intlStringPtr = newIntlString(temp, "BINARY");
@@ -715,12 +715,12 @@
{
size_t len = lex.ptr - lex.last_token - 4;
- if (len > MAX_COLUMN_SIZE)
+ if (len > MAX_STR_SIZE)
{
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
- Arg::Gds(isc_dsql_string_length) <<
+ Arg::Gds(isc_dsql_string_byte_length) <<
Arg::Num(len) <<
- Arg::Num(MAX_COLUMN_SIZE));
+ Arg::Num(MAX_STR_SIZE));
}
yylval.intlStringPtr = newIntlString(Firebird::string(lex.last_token + 3, len));
Modified: firebird/trunk/src/dsql/gen.cpp
===================================================================
--- firebird/trunk/src/dsql/gen.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/dsql/gen.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -40,6 +40,7 @@
#include "../dsql/DdlNodes.h"
#include "../dsql/ExprNodes.h"
#include "../dsql/StmtNodes.h"
+#include "../dsql/DSqlDataTypeUtil.h"
#include "../jrd/RecordSourceNodes.h"
#include "../jrd/ibase.h"
#include "../jrd/align.h"
@@ -158,6 +159,7 @@
dsqlScratch->appendUChar(message->msg_number);
dsqlScratch->appendUShort(message->msg_parameter);
+ DSqlDataTypeUtil dataTypeUtil(dsqlScratch);
ULONG offset = 0;
for (FB_SIZE_T i = 0; i < message->msg_parameters.getCount(); ++i)
@@ -207,7 +209,8 @@
// But we flag it to describe as text.
parameter->par_is_text = true;
parameter->par_desc.dsc_dtype = dtype_varying;
- parameter->par_desc.dsc_length += sizeof(USHORT);
+ parameter->par_desc.dsc_length = dataTypeUtil.fixLength(
+ ¶meter->par_desc, parameter->par_desc.dsc_length) + sizeof(USHORT);
}
const USHORT align = type_alignments[parameter->par_desc.dsc_dtype];
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/include/gen/codetext.h 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1163,7 +1163,8 @@
{"dsql_wlock_aggregates", 336397328},
{"dsql_wlock_conflict", 336397329},
{"dsql_max_exception_arguments", 336397330},
- {"dsql_string_length", 336397331},
+ {"dsql_string_byte_length", 336397331},
+ {"dsql_string_char_length", 336397332},
{"gsec_cant_open_db", 336723983},
{"gsec_switches_error", 336723984},
{"gsec_no_op_spec", 336723985},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/include/gen/iberror.h 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1197,7 +1197,8 @@
const ISC_STATUS isc_dsql_wlock_aggregates = 336397328L;
const ISC_STATUS isc_dsql_wlock_conflict = 336397329L;
const ISC_STATUS isc_dsql_max_exception_arguments = 336397330L;
-const ISC_STATUS isc_dsql_string_length = 336397331L;
+const ISC_STATUS isc_dsql_string_byte_length = 336397331L;
+const ISC_STATUS isc_dsql_string_char_length = 336397332L;
const ISC_STATUS isc_gsec_cant_open_db = 336723983L;
const ISC_STATUS isc_gsec_switches_error = 336723984L;
const ISC_STATUS isc_gsec_no_op_spec = 336723985L;
@@ -1300,7 +1301,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 = 1244;
+const ISC_STATUS isc_err_max = 1245;
#else /* c definitions */
@@ -2467,7 +2468,8 @@
#define isc_dsql_wlock_aggregates 336397328L
#define isc_dsql_wlock_conflict 336397329L
#define isc_dsql_max_exception_arguments 336397330L
-#define isc_dsql_string_length 336397331L
+#define isc_dsql_string_byte_length 336397331L
+#define isc_dsql_string_char_length 336397332L
#define isc_gsec_cant_open_db 336723983L
#define isc_gsec_switches_error 336723984L
#define isc_gsec_no_op_spec 336723985L
@@ -2570,7 +2572,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 1244
+#define isc_err_max 1245
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/include/gen/msgs.h 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1166,7 +1166,8 @@
{336397328, "WITH LOCK cannot be used with aggregates"}, /* dsql_wlock_aggregates */
{336397329, "WITH LOCK cannot be used with @1"}, /* dsql_wlock_conflict */
{336397330, "Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments"}, /* dsql_max_exception_arguments */
- {336397331, "String literal with @1 bytes exceeds the maximum length of @2 bytes"}, /* dsql_string_length */
+ {336397331, "String literal with @1 bytes exceeds the maximum length of @2 bytes"}, /* dsql_string_byte_length */
+ {336397332, "String literal with @1 characters exceeds the maximum length of @2 characters for the @3 character set"}, /* dsql_string_char_length */
{336723983, "unable to open database"}, /* gsec_cant_open_db */
{336723984, "error in switch specifications"}, /* gsec_switches_error */
{336723985, "no operation specified"}, /* gsec_no_op_spec */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/include/gen/sql_code.h 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1162,7 +1162,8 @@
{336397328, -104}, /* 1040 dsql_wlock_aggregates */
{336397329, -104}, /* 1041 dsql_wlock_conflict */
{336397330, -901}, /* 1042 dsql_max_exception_arguments */
- {336397331, -901}, /* 1043 dsql_string_length */
+ {336397331, -901}, /* 1043 dsql_string_byte_length */
+ {336397332, -901}, /* 1044 dsql_string_char_length */
{336723983, -901}, /* 15 gsec_cant_open_db */
{336723984, -901}, /* 16 gsec_switches_error */
{336723985, -901}, /* 17 gsec_no_op_spec */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/include/gen/sql_state.h 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1162,7 +1162,8 @@
{336397328, "42000"}, // 1040 dsql_wlock_aggregates
{336397329, "42000"}, // 1041 dsql_wlock_conflict
{336397330, "07002"}, // 1042 dsql_max_exception_arguments
- {336397331, "42000"}, // 1043 dsql_string_length
+ {336397331, "42000"}, // 1043 dsql_string_byte_length
+ {336397332, "42000"}, // 1044 dsql_string_char_length
{336723983, "00000"}, // 15 gsec_cant_open_db
{336723984, "00000"}, // 16 gsec_switches_error
{336723985, "00000"}, // 17 gsec_no_op_spec
Modified: firebird/trunk/src/jrd/DataTypeUtil.cpp
===================================================================
--- firebird/trunk/src/jrd/DataTypeUtil.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/jrd/DataTypeUtil.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -234,7 +234,7 @@
else if (desc->dsc_dtype == dtype_cstring)
overhead = sizeof(UCHAR);
- return MIN(((MAX_COLUMN_SIZE - overhead) / bpc) * bpc, length);
+ return MIN(((MAX_STR_SIZE - overhead) / bpc) * bpc, length);
}
@@ -308,7 +308,7 @@
{
SLONG constant = CVT_get_long(length, 0, ERR_post);
fb_assert(constant >= 0);
- len = MIN(len, MIN(MAX_COLUMN_SIZE, ULONG(constant)) * maxBytesPerChar(result->getCharSet()));
+ len = MIN(len, MIN(MAX_STR_SIZE, ULONG(constant)) * maxBytesPerChar(result->getCharSet()));
}
result->dsc_length = fixLength(result, len) + static_cast<USHORT>(sizeof(USHORT));
Modified: firebird/trunk/src/jrd/SysFunction.cpp
===================================================================
--- firebird/trunk/src/jrd/SysFunction.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/jrd/SysFunction.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -528,7 +528,7 @@
makeFromListResult(dataTypeUtil, function, result, argsCount, args);
if (result->isText())
- result->makeVarying(dataTypeUtil->fixLength(result, MAX_COLUMN_SIZE), result->getTextType());
+ result->makeVarying(dataTypeUtil->fixLength(result, MAX_STR_SIZE), result->getTextType());
}
***/
@@ -892,7 +892,7 @@
else
{
result->dsc_length = static_cast<USHORT>(sizeof(USHORT)) +
- dataTypeUtil->fixLength(result, MAX_COLUMN_SIZE);
+ dataTypeUtil->fixLength(result, MAX_STR_SIZE);
}
}
@@ -2768,7 +2768,7 @@
if (!value->isBlob() && !placing->isBlob())
{
const SINT64 newlen = (SINT64) len1 - length + len2;
- if (newlen > static_cast<SINT64>(MAX_COLUMN_SIZE - sizeof(USHORT)))
+ if (newlen > static_cast<SINT64>(MAX_STR_SIZE))
status_exception::raise(Arg::Gds(isc_arith_except) << Arg::Gds(isc_imp_exc));
dsc desc;
@@ -2910,7 +2910,7 @@
}
else
{
- if (padLen * cs->maxBytesPerChar() > MAX_COLUMN_SIZE - sizeof(USHORT))
+ if (padLen * cs->maxBytesPerChar() > MAX_STR_SIZE)
status_exception::raise(Arg::Gds(isc_arith_except) << Arg::Gds(isc_imp_exc));
dsc desc;
@@ -3266,7 +3266,7 @@
const unsigned int findLen = canonicals[1].getCount() / canonicalWidth;
const unsigned int replacementLen = lengths[2] / cs->minBytesPerChar();
- const USHORT len = MIN(MAX_COLUMN_SIZE, cs->maxBytesPerChar() *
+ const USHORT len = MIN(MAX_STR_SIZE, cs->maxBytesPerChar() *
MAX(searchedLen, searchedLen + (searchedLen / findLen) * (replacementLen - findLen)));
dsc desc;
Modified: firebird/trunk/src/jrd/blb.cpp
===================================================================
--- firebird/trunk/src/jrd/blb.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/jrd/blb.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -2648,7 +2648,7 @@
buffer.getBuffer((blob->blb_length / fromCharSet->minBytesPerChar()) * toCharSet->maxBytesPerChar());
const ULONG len = blob->BLB_get_data(tdbb, buffer.begin(), buffer.getCapacity(), true);
- if (len > MAX_COLUMN_SIZE - sizeof(USHORT))
+ if (len > MAX_STR_SIZE)
ERR_post(Arg::Gds(isc_arith_except) << Arg::Gds(isc_blob_truncation));
blobAsText.dsc_address = buffer.begin();
Modified: firebird/trunk/src/jrd/constants.h
===================================================================
--- firebird/trunk/src/jrd/constants.h 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/jrd/constants.h 2015-07-27 01:06:51 UTC (rev 62047)
@@ -52,7 +52,8 @@
// Column Limits
-const ULONG MAX_COLUMN_SIZE = 32767; // Bytes
+const ULONG MAX_COLUMN_SIZE = 32767; // Bytes
+const ULONG MAX_STR_SIZE = 65535; // Bytes
// Metadata constants
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/msgs/messages2.sql 2015-07-27 01:06:51 UTC (rev 62047)
@@ -2628,7 +2628,8 @@
('dsql_wlock_aggregates', 'pass1_rse_impl', 'pass1.cpp', NULL, 13, 1040, NULL, 'WITH LOCK cannot be used with aggregates', NULL, NULL);
('dsql_wlock_conflict', NULL, 'pass1.cpp', NULL, 13, 1041, NULL, 'WITH LOCK cannot be used with @1', NULL, NULL);
('dsql_max_exception_arguments', NULL, 'StmtNodes.cpp', NULL, 13, 1042, NULL, 'Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments', NULL, NULL);
-('dsql_string_length', NULL, 'Parser.cpp', NULL, 13, 1043, NULL, 'String literal with @1 bytes exceeds the maximum length of @2 bytes', NULL, NULL);
+('dsql_string_byte_length', NULL, 'Parser.cpp', NULL, 13, 1043, NULL, 'String literal with @1 bytes exceeds the maximum length of @2 bytes', NULL, NULL);
+('dsql_string_char_length', NULL, 'Parser.cpp', NULL, 13, 1044, NULL, 'String literal with @1 characters exceeds the maximum length of @2 characters for the @3 character set', NULL, NULL);
-- SQLWARN
(NULL, NULL, NULL, NULL, 14, 100, NULL, 'Row not found for fetch, update or delete, or the result of a query is an empty table.', NULL, NULL);
(NULL, NULL, NULL, NULL, 14, 101, NULL, 'segment buffer length shorter than expected', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/msgs/system_errors2.sql 2015-07-27 01:06:51 UTC (rev 62047)
@@ -1156,7 +1156,8 @@
(-104, '42', '000', 13, 1040, 'dsql_wlock_aggregates', NULL, NULL)
(-104, '42', '000', 13, 1041, 'dsql_wlock_conflict', NULL, NULL)
(-901, '07', '002', 13, 1042, 'dsql_max_exception_arguments', NULL, NULL)
-(-901, '42', '000', 13, 1043, 'dsql_string_length', NULL, NULL)
+(-901, '42', '000', 13, 1043, 'dsql_string_byte_length', NULL, NULL)
+(-901, '42', '000', 13, 1044, 'dsql_string_char_length', NULL, NULL)
-- GSEC
(-901, '00', '000', 18, 15, 'gsec_cant_open_db', NULL, NULL)
(-901, '00', '000', 18, 16, 'gsec_switches_error', NULL, NULL)
Modified: firebird/trunk/src/yvalve/gds.cpp
===================================================================
--- firebird/trunk/src/yvalve/gds.cpp 2015-07-27 01:06:33 UTC (rev 62046)
+++ firebird/trunk/src/yvalve/gds.cpp 2015-07-27 01:06:51 UTC (rev 62047)
@@ -3249,9 +3249,15 @@
break;
case op_literal:
- while (--n >= 0)
+ {
+ USHORT un = (USHORT) n;
+
+ while (un-- > 0)
blr_print_char(control);
+
+ n = (SSHORT) un;
break;
+ }
case op_join:
blr_print_join(control);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ego...@us...> - 2015-07-28 16:40:27
|
Revision: 62053
http://sourceforge.net/p/firebird/code/62053
Author: egorpugin
Date: 2015-07-28 16:40:25 +0000 (Tue, 28 Jul 2015)
Log Message:
-----------
[build][cmake] Fix OS X build with brew.
Modified Paths:
--------------
firebird/trunk/CMakeLists.txt
firebird/trunk/builds/cmake/Configure.cmake
Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt 2015-07-28 15:56:58 UTC (rev 62052)
+++ firebird/trunk/CMakeLists.txt 2015-07-28 16:40:25 UTC (rev 62053)
@@ -121,6 +121,7 @@
/usr/include/x86_64-linux-gnu
/usr/local/include
/opt/local/include
+ /usr/local/opt/icu4c/include
CMAKE_FIND_ROOT_PATH_BOTH
)
if ("${ICU_INCLUDE_DIR}" STREQUAL "ICU_INCLUDE_DIR-NOTFOUND")
@@ -236,6 +237,7 @@
if (NOT CMAKE_CROSSCOMPILING)
include_directories(/opt/local/include)
link_directories(/opt/local/lib)
+ link_directories(/usr/local/opt/icu4c/lib)
endif()
find_library(LIB_CoreFoundation CoreFoundation)
Modified: firebird/trunk/builds/cmake/Configure.cmake
===================================================================
--- firebird/trunk/builds/cmake/Configure.cmake 2015-07-28 15:56:58 UTC (rev 62052)
+++ firebird/trunk/builds/cmake/Configure.cmake 2015-07-28 16:40:25 UTC (rev 62053)
@@ -245,6 +245,10 @@
)
check_functions(functions_list)
+if (APPLE)
+ set(HAVE_QSORT_R 0 CACHE STRING "Disabled on OS X" FORCE)
+endif()
+
check_cxx_source_compiles("#include <unistd.h>\nmain(){fdatasync(0);}" HAVE_FDATASYNC)
check_library_exists(dl dladdr "${CMAKE_LIBRARY_PREFIX}" HAVE_DLADDR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2015-08-02 15:51:04
|
Revision: 62072
http://sourceforge.net/p/firebird/code/62072
Author: asfernandes
Date: 2015-08-02 15:51:01 +0000 (Sun, 02 Aug 2015)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/doc/README.trusted_authentication
firebird/trunk/src/burp/burp.cpp
firebird/trunk/src/common/classes/SyncObject.cpp
firebird/trunk/src/isql/isql.epp
firebird/trunk/src/jrd/validation.h
firebird/trunk/src/yvalve/utl.cpp
Modified: firebird/trunk/doc/README.trusted_authentication
===================================================================
--- firebird/trunk/doc/README.trusted_authentication 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/doc/README.trusted_authentication 2015-08-02 15:51:01 UTC (rev 62072)
@@ -8,7 +8,7 @@
Parameter Authentication in firebird.conf file is not used any more - it's replaced with more
generic AuthServer (and AuthClient) parameters. Also to use trusted authentication one should turn
off mandatory wire encryption because Win_Sspi plugin (which implements trusted authentication on
-windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
+Windows) does not provide an encryption key. So minimum changes in firebird.conf you need is:
AuthServer = Srp, Win_Sspi
WireCrypt = Enabled
Modified: firebird/trunk/src/burp/burp.cpp
===================================================================
--- firebird/trunk/src/burp/burp.cpp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/burp/burp.cpp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -127,7 +127,7 @@
char width;
};
static const char* STAT_CHARS = "TDRW";
-static const StatFormat STAT_FORMATS[] =
+static const StatFormat STAT_FORMATS[] =
{
{"time", "%4lu.%03u ", 9},
{"delta", "%2lu.%03u ", 7},
@@ -838,25 +838,29 @@
case IN_SW_BURP_STATS:
if (tdgbl->gbl_stat_flags)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
+
if (++itr >= argc)
- BURP_error(366, true); // statistics parameter missing
+ BURP_error(366, true); // statistics parameter missing
- {
+ { // scope
const char* perf_val = argv[itr];
const char* c = perf_val;
size_t len = strlen(STAT_CHARS);
+
for (; *c && len; c++, len--)
{
const char* pos = strchr(STAT_CHARS, toupper(*c));
if (!pos)
- BURP_error(367, true, SafeArg() << *c); // wrong char "@1" at statistics parameter
+ BURP_error(367, true, SafeArg() << *c); // wrong char "@1" at statistics parameter
tdgbl->gbl_stat_flags |= 1 << (pos - STAT_CHARS);
}
+
if (*c)
- BURP_error(368, true); // 'too many chars at statistics parameter'
+ BURP_error(368, true); // too many chars at statistics parameter
}
break;
+
case IN_SW_BURP_CO:
if (tdgbl->gbl_sw_convert_ext_tables)
BURP_error(334, true, SafeArg() << in_sw_tab->in_sw_name);
@@ -2461,7 +2465,7 @@
isc_database_info(status, &db_handle, sizeof(info), info, sizeof(buffer), buffer);
- char *p = buffer, *const e = buffer + sizeof(buffer);
+ char* p = buffer, *const e = buffer + sizeof(buffer);
while (p < e)
{
int flag = -1;
@@ -2483,7 +2487,7 @@
if (flag != -1)
{
const int len = isc_vax_integer(p + 1, 2);
- stats[flag] = isc_portable_integer((ISC_UCHAR*)p + 1 + 2, len);
+ stats[flag] = isc_portable_integer((ISC_UCHAR*) p + 1 + 2, len);
p += len + 3;
}
}
@@ -2559,6 +2563,7 @@
if (gbl_stat_flags & (1 << i))
burp_output(false, "%-*s", STAT_FORMATS[i].width, STAT_FORMATS[i].header);
}
+
burp_output(false, "\n");
}
Modified: firebird/trunk/src/common/classes/SyncObject.cpp
===================================================================
--- firebird/trunk/src/common/classes/SyncObject.cpp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/common/classes/SyncObject.cpp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -73,7 +73,7 @@
++waiters;
//while (true)
- while (!waitingThreads) // fair locking
+ while (!waitingThreads) // fair locking
{
const AtomicCounter::counter_type oldState = lockState;
if (oldState < 0)
Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/isql/isql.epp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -880,6 +880,7 @@
{
// Read the line
char buffer[MAX_USHORT];
+
if (fgets(buffer, sizeof(buffer), Filelist->Ifp().indev_fpointer) != NULL)
{
size_t lineSize = strlen(buffer);
@@ -5961,7 +5962,9 @@
txt.assign(v.value.asVary->vary_string, v.value.asVary->vary_length);
break;
}
+
txt.trim();
+
if (fieldInfo[i].skip && txt == fieldInfo[i].skip)
continue;
@@ -5971,6 +5974,7 @@
if (wasOut)
isqlGlob.printf("%s", NEWLINE);
+
return true;
}
Modified: firebird/trunk/src/jrd/validation.h
===================================================================
--- firebird/trunk/src/jrd/validation.h 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/jrd/validation.h 2015-08-02 15:51:01 UTC (rev 62072)
@@ -163,7 +163,7 @@
explicit UsedBdb(BufferDesc* _bdb) : bdb(_bdb), count(1) {}
BufferDesc* bdb;
- int count;
+ int count;
static const ULONG generate(const UsedBdb& p)
{
@@ -179,7 +179,6 @@
UsedBdbs vdr_used_bdbs;
-
void cleanup();
RTN corrupt(int, const jrd_rel*, ...);
FETCH_CODE fetch_page(bool validate, ULONG, USHORT, WIN*, void*);
Modified: firebird/trunk/src/yvalve/utl.cpp
===================================================================
--- firebird/trunk/src/yvalve/utl.cpp 2015-08-02 07:14:37 UTC (rev 62071)
+++ firebird/trunk/src/yvalve/utl.cpp 2015-08-02 15:51:01 UTC (rev 62072)
@@ -1038,7 +1038,7 @@
}
private:
- ClumpletWriter *pb;
+ ClumpletWriter* pb;
unsigned char nextTag;
string strVal;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2015-08-05 16:44:50
|
Revision: 62076
http://sourceforge.net/p/firebird/code/62076
Author: asfernandes
Date: 2015-08-05 16:44:48 +0000 (Wed, 05 Aug 2015)
Log Message:
-----------
Fixed CORE-4884 - Crash on pasring of script containing `execute block` with lot of nested begin..end statements.
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/dsql/DsqlCompilerScratch.h
firebird/trunk/src/dsql/StmtNodes.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 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2015-08-05 16:44:48 UTC (rev 62076)
@@ -2338,6 +2338,8 @@
PARAMETER (GDS__dsql_string_byte_length = 336397331)
INTEGER*4 GDS__dsql_string_char_length
PARAMETER (GDS__dsql_string_char_length = 336397332)
+ INTEGER*4 GDS__dsql_max_nesting
+ PARAMETER (GDS__dsql_max_nesting = 336397333)
INTEGER*4 GDS__gsec_cant_open_db
PARAMETER (GDS__gsec_cant_open_db = 336723983)
INTEGER*4 GDS__gsec_switches_error
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1176,6 +1176,7 @@
gds_dsql_max_exception_arguments = 336397330;
gds_dsql_string_byte_length = 336397331;
gds_dsql_string_char_length = 336397332;
+ gds_dsql_max_nesting = 336397333;
gds_gsec_cant_open_db = 336723983;
gds_gsec_switches_error = 336723984;
gds_gsec_no_op_spec = 336723985;
Modified: firebird/trunk/src/dsql/DsqlCompilerScratch.h
===================================================================
--- firebird/trunk/src/dsql/DsqlCompilerScratch.h 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/dsql/DsqlCompilerScratch.h 2015-08-05 16:44:48 UTC (rev 62076)
@@ -65,6 +65,8 @@
static const unsigned FLAG_DDL = 0x2000;
static const unsigned FLAG_FETCH = 0x4000;
+ static const unsigned MAX_NESTING = 512;
+
public:
DsqlCompilerScratch(MemoryPool& p, dsql_dbb* aDbb, jrd_tra* aTransaction,
DsqlCompiledStatement* aStatement)
@@ -73,6 +75,7 @@
transaction(aTransaction),
statement(aStatement),
flags(0),
+ nestingLevel(0),
ports(p),
relation(NULL),
procedure(NULL),
@@ -288,6 +291,7 @@
public:
unsigned flags; // flags
+ unsigned nestingLevel; // begin...end nesting level
Firebird::Array<dsql_msg*> ports; // Port messages
dsql_rel* relation; // relation created by this request (for DDL)
dsql_prc* procedure; // procedure created by this request (for DDL)
Modified: firebird/trunk/src/dsql/StmtNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/StmtNodes.cpp 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/dsql/StmtNodes.cpp 2015-08-05 16:44:48 UTC (rev 62076)
@@ -769,6 +769,13 @@
CompoundStmtNode* CompoundStmtNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
{
+ if (++dsqlScratch->nestingLevel > DsqlCompilerScratch::MAX_NESTING)
+ {
+ ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-901) <<
+ Arg::Gds(isc_imp_exc) <<
+ Arg::Gds(isc_dsql_max_nesting) << Arg::Num(DsqlCompilerScratch::MAX_NESTING));
+ }
+
CompoundStmtNode* node = FB_NEW(getPool()) CompoundStmtNode(getPool());
for (NestConst<StmtNode>* i = statements.begin(); i != statements.end(); ++i)
@@ -778,6 +785,8 @@
node->statements.add(ptr);
}
+ --dsqlScratch->nestingLevel;
+
return node;
}
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/include/gen/codetext.h 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1165,6 +1165,7 @@
{"dsql_max_exception_arguments", 336397330},
{"dsql_string_byte_length", 336397331},
{"dsql_string_char_length", 336397332},
+ {"dsql_max_nesting", 336397333},
{"gsec_cant_open_db", 336723983},
{"gsec_switches_error", 336723984},
{"gsec_no_op_spec", 336723985},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/include/gen/iberror.h 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1199,6 +1199,7 @@
const ISC_STATUS isc_dsql_max_exception_arguments = 336397330L;
const ISC_STATUS isc_dsql_string_byte_length = 336397331L;
const ISC_STATUS isc_dsql_string_char_length = 336397332L;
+const ISC_STATUS isc_dsql_max_nesting = 336397333L;
const ISC_STATUS isc_gsec_cant_open_db = 336723983L;
const ISC_STATUS isc_gsec_switches_error = 336723984L;
const ISC_STATUS isc_gsec_no_op_spec = 336723985L;
@@ -1301,7 +1302,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 = 1245;
+const ISC_STATUS isc_err_max = 1246;
#else /* c definitions */
@@ -2470,6 +2471,7 @@
#define isc_dsql_max_exception_arguments 336397330L
#define isc_dsql_string_byte_length 336397331L
#define isc_dsql_string_char_length 336397332L
+#define isc_dsql_max_nesting 336397333L
#define isc_gsec_cant_open_db 336723983L
#define isc_gsec_switches_error 336723984L
#define isc_gsec_no_op_spec 336723985L
@@ -2572,7 +2574,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 1245
+#define isc_err_max 1246
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/include/gen/msgs.h 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1168,6 +1168,7 @@
{336397330, "Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments"}, /* dsql_max_exception_arguments */
{336397331, "String literal with @1 bytes exceeds the maximum length of @2 bytes"}, /* dsql_string_byte_length */
{336397332, "String literal with @1 characters exceeds the maximum length of @2 characters for the @3 character set"}, /* dsql_string_char_length */
+ {336397333, "Too many BEGIN...END nesting. Max level is @1"}, /* dsql_max_nesting */
{336723983, "unable to open database"}, /* gsec_cant_open_db */
{336723984, "error in switch specifications"}, /* gsec_switches_error */
{336723985, "no operation specified"}, /* gsec_no_op_spec */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/include/gen/sql_code.h 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1164,6 +1164,7 @@
{336397330, -901}, /* 1042 dsql_max_exception_arguments */
{336397331, -901}, /* 1043 dsql_string_byte_length */
{336397332, -901}, /* 1044 dsql_string_char_length */
+ {336397333, -901}, /* 1045 dsql_max_nesting */
{336723983, -901}, /* 15 gsec_cant_open_db */
{336723984, -901}, /* 16 gsec_switches_error */
{336723985, -901}, /* 17 gsec_no_op_spec */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/include/gen/sql_state.h 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1164,6 +1164,7 @@
{336397330, "07002"}, // 1042 dsql_max_exception_arguments
{336397331, "42000"}, // 1043 dsql_string_byte_length
{336397332, "42000"}, // 1044 dsql_string_char_length
+ {336397333, "07002"}, // 1045 dsql_max_nesting
{336723983, "00000"}, // 15 gsec_cant_open_db
{336723984, "00000"}, // 16 gsec_switches_error
{336723985, "00000"}, // 17 gsec_no_op_spec
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/msgs/facilities2.sql 2015-08-05 16:44:48 UTC (rev 62076)
@@ -10,7 +10,7 @@
('1996-11-07 13:39:40', 'INSTALL', 10, 1)
('1996-11-07 13:38:41', 'TEST', 11, 4)
('2015-07-23 14:20:00', 'GBAK', 12, 370)
-('2015-05-04 13:00:00', 'SQLERR', 13, 1044)
+('2015-08-05 12:40:00', 'SQLERR', 13, 1045)
('1996-11-07 13:38:42', 'SQLWARN', 14, 613)
('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307)
('2014-05-07 03:04:46', 'ISQL', 17, 190)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/msgs/messages2.sql 2015-08-05 16:44:48 UTC (rev 62076)
@@ -2630,6 +2630,7 @@
('dsql_max_exception_arguments', NULL, 'StmtNodes.cpp', NULL, 13, 1042, NULL, 'Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments', NULL, NULL);
('dsql_string_byte_length', NULL, 'Parser.cpp', NULL, 13, 1043, NULL, 'String literal with @1 bytes exceeds the maximum length of @2 bytes', NULL, NULL);
('dsql_string_char_length', NULL, 'Parser.cpp', NULL, 13, 1044, NULL, 'String literal with @1 characters exceeds the maximum length of @2 characters for the @3 character set', NULL, NULL);
+('dsql_max_nesting', NULL, 'StmtNodes.cpp', NULL, 13, 1045, NULL, 'Too many BEGIN...END nesting. Maximum level is @1', NULL, NULL);
-- SQLWARN
(NULL, NULL, NULL, NULL, 14, 100, NULL, 'Row not found for fetch, update or delete, or the result of a query is an empty table.', NULL, NULL);
(NULL, NULL, NULL, NULL, 14, 101, NULL, 'segment buffer length shorter than expected', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2015-08-03 01:41:34 UTC (rev 62075)
+++ firebird/trunk/src/msgs/system_errors2.sql 2015-08-05 16:44:48 UTC (rev 62076)
@@ -1158,6 +1158,7 @@
(-901, '07', '002', 13, 1042, 'dsql_max_exception_arguments', NULL, NULL)
(-901, '42', '000', 13, 1043, 'dsql_string_byte_length', NULL, NULL)
(-901, '42', '000', 13, 1044, 'dsql_string_char_length', NULL, NULL)
+(-901, '07', '002', 13, 1045, 'dsql_max_nesting', NULL, NULL)
-- GSEC
(-901, '00', '000', 18, 15, 'gsec_cant_open_db', NULL, NULL)
(-901, '00', '000', 18, 16, 'gsec_switches_error', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2015-08-10 14:20:58
|
Revision: 62090
http://sourceforge.net/p/firebird/code/62090
Author: firebirds
Date: 2015-08-10 14:20:55 +0000 (Mon, 10 Aug 2015)
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 2015-08-09 20:58:10 UTC (rev 62089)
+++ firebird/trunk/ChangeLog 2015-08-10 14:20:55 UTC (rev 62090)
@@ -1,24 +1,94 @@
- 2015-07-28 12:40 egorpugin
+ 2015-08-09 20:57 hvlad
+ M src/jrd/btr.cpp
+ M src/jrd/validation.cpp
+Fixed bug CORE-4904 : Index corruption when add data in long-key-indexed field
+
+ 2015-08-07 05:52 mapopa
+ M src/utilities/ibmgr/srvrmgr.cpp
+server_is_ok not used or replaced
+
+ 2015-08-06 11:49 hvlad
+ M src/jrd/validation.h
+Misc
+
+ 2015-08-05 16:44 asfernandes
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/StmtNodes.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
+Fixed CORE-4884 - Crash on pasring of script containing `execute block` with lot of nested begin..end statements.
+
+ 2015-08-03 01:41 asfernandes
+ M src/jrd/idx.h
+Improvement CORE-4898 - Speed up function creation and loading when there are many functions in the database.
+
+ 2015-08-03 01:27 asfernandes
+ M src/jrd/Function.epp
+ M src/jrd/met.epp
+Improvement CORE-4880 - Increase speed of creating package when number of its functions more than several hundreds.
+
+ 2015-08-02 19:00 hvlad
+ M src/jrd/validation.h
+1. I see no reason to use explicit constructor in this case. More, it breaks build.
+2. One more paranoid check by Claudio :)
+
+ 2015-08-02 15:51 asfernandes
+ M doc/README.trusted_authentication
+ M src/burp/burp.cpp
+ M src/common/classes/SyncObject.cpp
+ M src/isql/isql.epp
+ M src/jrd/validation.h
+ M src/yvalve/utl.cpp
+Misc.
+
+ 2015-08-02 03:10 robocop
+ M src/burp/burp.cpp
+ M src/include/firebird/FirebirdInterface.idl
+ M src/jrd/validation.h
+Misc.
+
+ 2015-07-31 09:21 mapopa
+ M README.md
+Add Downloads totals image https://img.shields.io/sourceforge/dt/firebird.png
+
+ 2015-07-30 09:50 dimitr
+ M src/jrd/build_no.h
+ M src/misc/writeBuildNum.sh
+Manual update: changelog + buildno.
+
+ 2015-07-30 09:50 dimitr
+ M ChangeLog
+Manual update: changelog + buildno.
+
+ 2015-07-28 16:40 egorpugin
M CMakeLists.txt
M builds/cmake/Configure.cmake
[build][cmake] Fix OS X build with brew.
- 2015-07-28 11:56 asfernandes
+ 2015-07-28 15:56 asfernandes
M src/dsql/PackageNodes.epp
M src/dsql/PackageNodes.h
Fixed CORE-4887 - AFTER CREATE/ALTER PACKAGE DDL triggers runs in incorrectly moment.
- 2015-07-28 11:56 asfernandes
+ 2015-07-28 15:56 asfernandes
M src/dsql/PackageNodes.epp
Fixed weird indentation.
- 2015-07-28 07:26 hvlad
+ 2015-07-28 11:26 hvlad
M src/burp/backup.epp
M src/burp/burp.cpp
M src/burp/restore.epp
Make gbak output a bit more consistent look (see also CORE-1999)
- 2015-07-26 21:06 asfernandes
+ 2015-07-27 01:06 asfernandes
M lang_helpers/gds_codes.ftn
M lang_helpers/gds_codes.pas
M src/dsql/ExprNodes.cpp
@@ -38,15 +108,15 @@
M src/yvalve/gds.cpp
Fixed CORE-4881 - Increase maximum string literal length to 64K (bytes) while setting a lower limit (of characters) for multibyte charsets based on their max char. length (UTF-8 literals will be limited to 16383 characters).
- 2015-07-26 21:06 asfernandes
+ 2015-07-27 01:06 asfernandes
M src/isql/isql.epp
Fixed CORE-4882 - ISQL input command (or -i option) reads large (> 64K) lines incorrectly.
- 2015-07-26 17:03 hvlad
+ 2015-07-26 21:03 hvlad
M src/msgs/facilities2.sql
Reserve facility code 26 (name "JAYBIRD") for JayBird needs
- 2015-07-26 16:49 hvlad
+ 2015-07-26 20:49 hvlad
M src/burp/backup.epp
M src/burp/burp.cpp
M src/burp/burp.h
@@ -64,144 +134,144 @@
Thanks to Alex for help.
Documentation will follow.
- 2015-07-26 15:58 hvlad
+ 2015-07-26 19:58 hvlad
M src/common/classes/SyncObject.cpp
Restore fair locking in SyncObject (it was disabled until validation code changed to avoid recursive latches).
- 2015-07-26 15:56 hvlad
+ 2015-07-26 19:56 hvlad
M src/jrd/validation.cpp
M src/jrd/validation.h
Change validation code to avoid recursive latches (as it is not supported in fb3 cch).
- 2015-07-26 14:25 alexpeshkoff
+ 2015-07-26 18:25 alexpeshkoff
M src/include/firebird/FirebirdInterface.idl
M src/include/firebird/IdlFbInterfaces.h
M src/yvalve/YObjects.h
M src/yvalve/utl.cpp
Added getClientVersion() method to Util interface and XpbBuilder interface to work with DPB/SPB/etc formats
- 2015-07-26 14:23 alexpeshkoff
+ 2015-07-26 18:23 alexpeshkoff
M src/common/classes/ClumpletReader.cpp
M src/common/classes/ClumpletReader.h
M src/jrd/Mapping.cpp
Fixed an issue with missing auth source info when using trusted auth
- 2015-07-26 14:22 alexpeshkoff
+ 2015-07-26 18:22 alexpeshkoff
M src/jrd/license.h
Minor enhancement - show that build is DEV in "show version"
- 2015-07-26 14:13 alexpeshkoff
+ 2015-07-26 18:13 alexpeshkoff
M src/jrd/svc.cpp
M src/jrd/svc.h
Fixed CORE-4879: Minor inconvenience in user management via services API - fixed order of parameters in SPB required
- 2015-07-26 14:09 alexpeshkoff
+ 2015-07-26 18:09 alexpeshkoff
M src/remote/server/os/posix/inet_server.cpp
Better statrtup error diags
- 2015-07-26 14:07 alexpeshkoff
+ 2015-07-26 18:07 alexpeshkoff
M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
Minor optimization - use on-stack allocation instead new/delete
- 2015-07-26 14:06 alexpeshkoff
+ 2015-07-26 18:06 alexpeshkoff
M doc/README.trusted_authentication
Fixed old text to make it match v.3 reality
- 2015-07-26 14:04 alexpeshkoff
+ 2015-07-26 18:04 alexpeshkoff
M builds/install/posix-common/changeServerMode.sh.in
Use new ServerMode parameter in the script
- 2015-07-26 14:03 alexpeshkoff
+ 2015-07-26 18:03 alexpeshkoff
M builds/install/arch-specific/linux/firebird.init.d.gentoo.in
Bring gentoo installation up-to-date
- 2015-07-26 14:02 alexpeshkoff
+ 2015-07-26 18:02 alexpeshkoff
M builds/install/arch-specific/linux/linuxLibrary.sh.in
This should fix issues with different systemd location in FS
- 2015-07-26 11:38 asfernandes
+ 2015-07-26 15:38 asfernandes
M src/isql/isql.epp
On behalf of alexpeshkoff after sourceforge crash - Postfix for CORE-4811: Avoid use of monitoring tables in ISQL's frontend as suggested by Dmitry
- 2015-07-26 11:38 asfernandes
+ 2015-07-26 15:38 asfernandes
M src/isql/isql.epp
On behalf of alexpeshkoff after sourceforge crash - Postfix for CORE-4811: display in ISQL database, user and role as server sees them
- 2015-07-26 11:38 asfernandes
+ 2015-07-26 15:38 asfernandes
M src/common/utils.cpp
On behalf of alexpeshkoff after sourceforge crash - Postfix for CORE-4811: strip single quotes, not making them keep case of ascii string, when used in DPB (connect/create database)
- 2015-07-26 11:37 asfernandes
+ 2015-07-26 15:37 asfernandes
M src/gpre/gpre.h
On behalf of mapopa after sourceforge crash - remove unused DBB_ flags from comments
- 2015-07-26 11:37 asfernandes
+ 2015-07-26 15:37 asfernandes
M src/gpre/gpre.h
On behalf of mapopa after sourceforge crash - DBB_v3 was removed , remove from comments http://sourceforge.net/p/firebird/mailman/message/16823672/
- 2015-07-26 11:37 asfernandes
+ 2015-07-26 15:37 asfernandes
M src/gpre/cmd.cpp
On behalf of mapopa after sourceforge crash - FLINT_CACHE was never used , dead leftover from ib 4.0 product years http://sourceforge.net/p/firebird/mailman/message/30668961/
- 2015-07-26 11:37 asfernandes
+ 2015-07-26 15:37 asfernandes
M src/qli/show.epp
On behalf of mapopa after sourceforge crash - remove comment MET_exact_name() is no more replaced with fb_utils::exact_name
- 2015-07-26 11:37 asfernandes
+ 2015-07-26 15:37 asfernandes
M src/isql/iutils.cpp
M src/yvalve/array.epp
M src/yvalve/blob.epp
On behalf of mapopa after sourceforge crash - MET_exact_name , DYN_terminate are no more
- 2015-07-26 11:36 asfernandes
+ 2015-07-26 15:36 asfernandes
M src/isql/iutils.cpp
M src/isql/iutils_proto.h
On behalf of mapopa after sourceforge crash - IUTILS_blankterm2 replaced with fb_utils::exact_name (NOT_USED_OR_REPLACED)
- 2015-07-26 11:36 asfernandes
+ 2015-07-26 15:36 asfernandes
M src/gpre/gpre.h
M src/gpre/par.cpp
On behalf of mapopa after sourceforge crash - unused enum member lang_epascal
- 2015-07-26 11:36 asfernandes
+ 2015-07-26 15:36 asfernandes
M src/gpre/gpre.cpp
M src/gpre/gpre_proto.h
On behalf of mapopa after sourceforge crash - Remove gpre BASIC function (NOT_USED_OR_REPLACED)
- 2015-07-26 11:36 asfernandes
+ 2015-07-26 15:36 asfernandes
M src/common/StatusHolder.h
M src/jrd/status.h
On behalf of robocop after sourceforge crash - Misc.
- 2015-07-26 11:35 asfernandes
+ 2015-07-26 15:35 asfernandes
M src/jrd/jrd.cpp
On behalf of alexpeshkoff after sourceforge crash - Postfix for CORE-4811: fix handling case for OS names
- 2015-07-26 03:50 dimitr
+ 2015-07-26 07:50 dimitr
M src/common/isc_file.cpp
Fixed hostless INET/WNET connections on Linux.
- 2015-07-15 10:14 hvlad
+ 2015-07-15 14:14 hvlad
M src/utilities/fbsvcmgr/fbsvcmgr.cpp
Fixed bug CORE-4876
fbsvcmgr shows wrong options for some Trace API services in help screen
- 2015-07-15 08:07 dimitr
+ 2015-07-15 12:07 dimitr
M src/remote/client/BlrFromMessage.cpp
M src/remote/client/BlrFromMessage.h
M src/remote/client/interface.cpp
This should fix CORE-4872: v3 fbclient cannot work with servers older than v2.5 via the remote protocol.
- 2015-07-15 07:10 hvlad
+ 2015-07-15 11:10 hvlad
M src/jrd/dpm.epp
Correction
- 2015-07-15 06:55 hvlad
+ 2015-07-15 10:55 hvlad
M src/utilities/gsec/main/gsecMain.cpp
gsec also could hung on exit if worker database have non-zero LINGER set.
Seems we must add fb_shutdown to the every utility which could load embedded engine...
- 2015-07-15 06:42 hvlad
+ 2015-07-15 10:42 hvlad
M src/remote/server/os/win32/srvr_w32.cpp
Windows-specific part for CORE-4871
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-08-09 20:58:10 UTC (rev 62089)
+++ firebird/trunk/src/jrd/build_no.h 2015-08-10 14:20:55 UTC (rev 62090)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31942
+ FORMAL BUILD NUMBER:31993
*/
-#define PRODUCT_VER_STRING "3.0.0.31981"
-#define FILE_VER_STRING "WI-V3.0.0.31981"
-#define LICENSE_VER_STRING "WI-V3.0.0.31981"
-#define FILE_VER_NUMBER 3, 0, 0, 31981
+#define PRODUCT_VER_STRING "3.0.0.31993"
+#define FILE_VER_STRING "WI-V3.0.0.31993"
+#define LICENSE_VER_STRING "WI-V3.0.0.31993"
+#define FILE_VER_NUMBER 3, 0, 0, 31993
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31981"
+#define FB_BUILD_NO "31993"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-08-09 20:58:10 UTC (rev 62089)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-08-10 14:20:55 UTC (rev 62090)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31981
+BuildNum=31993
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...> - 2015-08-12 00:08:59
|
Revision: 62094
http://sourceforge.net/p/firebird/code/62094
Author: firebirds
Date: 2015-08-12 00:08:57 +0000 (Wed, 12 Aug 2015)
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 2015-08-11 15:46:36 UTC (rev 62093)
+++ firebird/trunk/ChangeLog 2015-08-12 00:08:57 UTC (rev 62094)
@@ -1,3 +1,13 @@
+ 2015-08-11 15:46 asfernandes
+ M src/include/gen/msgs.h
+Misc.
+
+ 2015-08-11 15:46 asfernandes
+ M src/isql/isql.epp
+Fixed two problem when a expression is described with a collation (i.e., when the expression charset matches the connection charset):
+- Broken display of charset name with SQLDA_DISPLAY
+- Broken UTF-8 alignment
+
2015-08-09 20:57 hvlad
M src/jrd/btr.cpp
M src/jrd/validation.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-08-11 15:46:36 UTC (rev 62093)
+++ firebird/trunk/src/jrd/build_no.h 2015-08-12 00:08:57 UTC (rev 62094)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31993
+ FORMAL BUILD NUMBER:31995
*/
-#define PRODUCT_VER_STRING "3.0.0.31993"
-#define FILE_VER_STRING "WI-V3.0.0.31993"
-#define LICENSE_VER_STRING "WI-V3.0.0.31993"
-#define FILE_VER_NUMBER 3, 0, 0, 31993
+#define PRODUCT_VER_STRING "3.0.0.31995"
+#define FILE_VER_STRING "WI-V3.0.0.31995"
+#define LICENSE_VER_STRING "WI-V3.0.0.31995"
+#define FILE_VER_NUMBER 3, 0, 0, 31995
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31993"
+#define FB_BUILD_NO "31995"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-08-11 15:46:36 UTC (rev 62093)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-08-12 00:08:57 UTC (rev 62094)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31993
+BuildNum=31995
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...> - 2015-08-13 00:07:56
|
Revision: 62097
http://sourceforge.net/p/firebird/code/62097
Author: firebirds
Date: 2015-08-13 00:07:54 +0000 (Thu, 13 Aug 2015)
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 2015-08-12 13:38:20 UTC (rev 62096)
+++ firebird/trunk/ChangeLog 2015-08-13 00:07:54 UTC (rev 62097)
@@ -1,3 +1,14 @@
+ 2015-08-12 13:38 hvlad
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/TracePluginImpl.h
+ M src/utilities/ntrace/traceplugin.cpp
+Fixed bug CORE-4906 : AV when server is shutted down with active trace session(s)
+
+ 2015-08-12 08:58 hvlad
+ M src/jrd/trace/TraceManager.cpp
+ M src/jrd/trace/TraceSession.h
+Fixed bug CORE-4889 : FBSVCMGR with `action_trace_start` prevents in 3.0 SuperServer from connecting using local protocol
+
2015-08-11 15:46 asfernandes
M src/include/gen/msgs.h
Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-08-12 13:38:20 UTC (rev 62096)
+++ firebird/trunk/src/jrd/build_no.h 2015-08-13 00:07:54 UTC (rev 62097)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31995
+ FORMAL BUILD NUMBER:31997
*/
-#define PRODUCT_VER_STRING "3.0.0.31995"
-#define FILE_VER_STRING "WI-V3.0.0.31995"
-#define LICENSE_VER_STRING "WI-V3.0.0.31995"
-#define FILE_VER_NUMBER 3, 0, 0, 31995
+#define PRODUCT_VER_STRING "3.0.0.31997"
+#define FILE_VER_STRING "WI-V3.0.0.31997"
+#define LICENSE_VER_STRING "WI-V3.0.0.31997"
+#define FILE_VER_NUMBER 3, 0, 0, 31997
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31995"
+#define FB_BUILD_NO "31997"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-08-12 13:38:20 UTC (rev 62096)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-08-13 00:07:54 UTC (rev 62097)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31995
+BuildNum=31997
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...> - 2015-08-14 00:09:13
|
Revision: 62100
http://sourceforge.net/p/firebird/code/62100
Author: firebirds
Date: 2015-08-14 00:09:10 +0000 (Fri, 14 Aug 2015)
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 2015-08-13 04:09:55 UTC (rev 62099)
+++ firebird/trunk/ChangeLog 2015-08-14 00:09:10 UTC (rev 62100)
@@ -1,3 +1,7 @@
+ 2015-08-13 04:09 robocop
+ M src/jrd/btr.cpp
+Misc.
+
2015-08-12 13:38 hvlad
M src/utilities/ntrace/TracePluginImpl.cpp
M src/utilities/ntrace/TracePluginImpl.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-08-13 04:09:55 UTC (rev 62099)
+++ firebird/trunk/src/jrd/build_no.h 2015-08-14 00:09:10 UTC (rev 62100)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31997
+ FORMAL BUILD NUMBER:31998
*/
-#define PRODUCT_VER_STRING "3.0.0.31997"
-#define FILE_VER_STRING "WI-V3.0.0.31997"
-#define LICENSE_VER_STRING "WI-V3.0.0.31997"
-#define FILE_VER_NUMBER 3, 0, 0, 31997
+#define PRODUCT_VER_STRING "3.0.0.31998"
+#define FILE_VER_STRING "WI-V3.0.0.31998"
+#define LICENSE_VER_STRING "WI-V3.0.0.31998"
+#define FILE_VER_NUMBER 3, 0, 0, 31998
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31997"
+#define FB_BUILD_NO "31998"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-08-13 04:09:55 UTC (rev 62099)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-08-14 00:09:10 UTC (rev 62100)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31997
+BuildNum=31998
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...> - 2015-08-15 00:08:52
|
Revision: 62104
http://sourceforge.net/p/firebird/code/62104
Author: firebirds
Date: 2015-08-15 00:08:50 +0000 (Sat, 15 Aug 2015)
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 2015-08-14 15:26:04 UTC (rev 62103)
+++ firebird/trunk/ChangeLog 2015-08-15 00:08:50 UTC (rev 62104)
@@ -1,3 +1,7 @@
+ 2015-08-14 14:41 alexpeshkoff
+ M src/jrd/svc.cpp
+Fixed CORE-4897: FBSVCMGR can produce broken log when restoring database
+
2015-08-13 04:09 robocop
M src/jrd/btr.cpp
Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-08-14 15:26:04 UTC (rev 62103)
+++ firebird/trunk/src/jrd/build_no.h 2015-08-15 00:08:50 UTC (rev 62104)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31998
+ FORMAL BUILD NUMBER:31999
*/
-#define PRODUCT_VER_STRING "3.0.0.31998"
-#define FILE_VER_STRING "WI-V3.0.0.31998"
-#define LICENSE_VER_STRING "WI-V3.0.0.31998"
-#define FILE_VER_NUMBER 3, 0, 0, 31998
+#define PRODUCT_VER_STRING "3.0.0.31999"
+#define FILE_VER_STRING "WI-V3.0.0.31999"
+#define LICENSE_VER_STRING "WI-V3.0.0.31999"
+#define FILE_VER_NUMBER 3, 0, 0, 31999
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31998"
+#define FB_BUILD_NO "31999"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-08-14 15:26:04 UTC (rev 62103)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-08-15 00:08:50 UTC (rev 62104)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31998
+BuildNum=31999
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...> - 2015-08-17 00:08:30
|
Revision: 62108
http://sourceforge.net/p/firebird/code/62108
Author: firebirds
Date: 2015-08-17 00:08:28 +0000 (Mon, 17 Aug 2015)
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 2015-08-16 15:47:30 UTC (rev 62107)
+++ firebird/trunk/ChangeLog 2015-08-17 00:08:28 UTC (rev 62108)
@@ -1,3 +1,14 @@
+ 2015-08-16 15:47 dimitr
+ M src/jrd/recsrc/HashJoin.cpp
+Fixed the hash-join part of CORE-4909: MERGE / HASH JOINs produce incorrect results when VARCHAR join keys differ only by trailing spaces.
+
+ 2015-08-16 13:53 asfernandes
+ M src/jrd/btr.cpp
+ M src/jrd/validation.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+ M src/utilities/ntrace/TracePluginImpl.h
+Misc.
+
2015-08-14 14:41 alexpeshkoff
M src/jrd/svc.cpp
Fixed CORE-4897: FBSVCMGR can produce broken log when restoring database
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2015-08-16 15:47:30 UTC (rev 62107)
+++ firebird/trunk/src/jrd/build_no.h 2015-08-17 00:08:28 UTC (rev 62108)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:31999
+ FORMAL BUILD NUMBER:32001
*/
-#define PRODUCT_VER_STRING "3.0.0.31999"
-#define FILE_VER_STRING "WI-V3.0.0.31999"
-#define LICENSE_VER_STRING "WI-V3.0.0.31999"
-#define FILE_VER_NUMBER 3, 0, 0, 31999
+#define PRODUCT_VER_STRING "3.0.0.32001"
+#define FILE_VER_STRING "WI-V3.0.0.32001"
+#define LICENSE_VER_STRING "WI-V3.0.0.32001"
+#define FILE_VER_NUMBER 3, 0, 0, 32001
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "31999"
+#define FB_BUILD_NO "32001"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2015-08-16 15:47:30 UTC (rev 62107)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2015-08-17 00:08:28 UTC (rev 62108)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=31999
+BuildNum=32001
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