From: <ale...@us...> - 2014-05-22 10:47:07
|
Revision: 59617 http://sourceforge.net/p/firebird/code/59617 Author: alexpeshkoff Date: 2014-05-22 10:47:03 +0000 (Thu, 22 May 2014) Log Message: ----------- Arm64 port Modified Paths: -------------- firebird/trunk/configure.ac firebird/trunk/src/common/classes/DbImplementation.cpp firebird/trunk/src/common/common.h firebird/trunk/src/jrd/inf_pub.h Added Paths: ----------- firebird/trunk/builds/posix/prefix.linux_arm64 Added: firebird/trunk/builds/posix/prefix.linux_arm64 =================================================================== --- firebird/trunk/builds/posix/prefix.linux_arm64 (rev 0) +++ firebird/trunk/builds/posix/prefix.linux_arm64 2014-05-22 10:47:03 UTC (rev 59617) @@ -0,0 +1,27 @@ +# The contents of this file are subject to the Interbase Public +# License Version 1.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy +# of the License at http://www.Inprise.com/IPL.html +# +# Software distributed under the License is distributed on an +# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express +# or implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code was created by Inprise Corporation +# and its predecessors. Portions created by Inprise Corporation are +# Copyright (C) Inprise Corporation. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Start of file prefix.linux: $(VERSION) $(PLATFORM) +# 14 Apr 2008 Alan Barclay alan AT escribe.co.uk + + +#LD=@CXX@ + +#PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DLINUX -pipe -MMD -fPIC +#DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch + +PROD_FLAGS=-O3 -DLINUX -DARM64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 +DEV_FLAGS=-ggdb -DLINUX -DARM64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 -Wno-non-virtual-dtor Property changes on: firebird/trunk/builds/posix/prefix.linux_arm64 ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: firebird/trunk/configure.ac =================================================================== --- firebird/trunk/configure.ac 2014-05-22 10:28:25 UTC (rev 59616) +++ firebird/trunk/configure.ac 2014-05-22 10:47:03 UTC (rev 59617) @@ -239,6 +239,17 @@ STD_EDITLINE=true ;; + aarch64*-*-linux*) // port was not tested + MAKEFILE_PREFIX=linux_arm64 + INSTALL_PREFIX=linux + PLATFORM=LINUX + AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) + EDITLINE_FLG=Y + SHRLIB_EXT=so + STD_EDITLINE=true + STD_ICU=true + ;; + sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu) MAKEFILE_PREFIX=linux_sparc32 INSTALL_PREFIX=linux Modified: firebird/trunk/src/common/classes/DbImplementation.cpp =================================================================== --- firebird/trunk/src/common/classes/DbImplementation.cpp 2014-05-22 10:28:25 UTC (rev 59616) +++ firebird/trunk/src/common/classes/DbImplementation.cpp 2014-05-22 10:47:03 UTC (rev 59617) @@ -46,6 +46,7 @@ static const UCHAR CpuSheb = 12; static const UCHAR CpuHppa = 13; static const UCHAR CpuAlpha = 14; +static const UCHAR CpuArm64 = 15; static const UCHAR OsWindows = 0; static const UCHAR OsLinux = 1; @@ -83,7 +84,8 @@ "SH", "SHEB", "HPPA", - "Alpha" + "Alpha", + "ARM64" }; const char* operatingSystem[] = { @@ -110,22 +112,22 @@ // This table lists pre-fb3 imlementation codes const UCHAR backwardTable[FB_NELEM(hardware) * FB_NELEM(operatingSystem)] = { -// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha -/* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* Linux */ 60, 66, 65, 69, 0, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, -/* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* Solaris */ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* HPUX */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, -/* AIX */ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* MVS */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* FreeBSD */ 61, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* NetBSD */ 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 +/* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +/* Linux */ 60, 66, 65, 69, 0, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, 84, +/* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +/* Solaris */ 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +/* HPUX */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, +/* AIX */ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +/* MVS */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +/* FreeBSD */ 61, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +/* NetBSD */ 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; const UCHAR backEndianess[FB_NELEM(hardware)] = { -// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha - 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0 +// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 + 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0 }; } // anonymous namespace Modified: firebird/trunk/src/common/common.h =================================================================== --- firebird/trunk/src/common/common.h 2014-05-22 10:28:25 UTC (rev 59616) +++ firebird/trunk/src/common/common.h 2014-05-22 10:47:03 UTC (rev 59617) @@ -134,6 +134,10 @@ #define FB_CPU CpuArm #endif /* ARM */ +#ifdef ARM64 +#define FB_CPU CpuArm64 +#endif /* ARM64 */ + #ifdef sparc #define FB_CPU CpuUltraSparc #define RISC_ALIGNMENT Modified: firebird/trunk/src/jrd/inf_pub.h =================================================================== --- firebird/trunk/src/jrd/inf_pub.h 2014-05-22 10:28:25 UTC (rev 59616) +++ firebird/trunk/src/jrd/inf_pub.h 2014-05-22 10:47:03 UTC (rev 59617) @@ -215,6 +215,9 @@ isc_info_db_impl_linux_sh = 80, isc_info_db_impl_linux_sheb = 81, + isc_info_db_impl_linux_hppa = 82, + isc_info_db_impl_linux_alpha = 83, + isc_info_db_impl_linux_arm64 = 84, isc_info_db_impl_last_value // Leave this LAST! }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-05-23 00:28:43
|
Revision: 59619 http://sourceforge.net/p/firebird/code/59619 Author: firebirds Date: 2014-05-23 00:28:39 +0000 (Fri, 23 May 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-05-22 13:18:48 UTC (rev 59618) +++ firebird/trunk/ChangeLog 2014-05-23 00:28:39 UTC (rev 59619) @@ -1,3 +1,17 @@ + 2014-05-22 13:18 alexpeshkoff + M src/auth/SecureRemotePassword/manage/SrpManagement.cpp + M src/auth/SecureRemotePassword/server/SrpServer.cpp + M src/jrd/fields.h +Fixed CORE-4430: Properties of user created in Legacy_UserManager padded with space up to 10 character + + 2014-05-22 10:47 alexpeshkoff + A builds/posix/prefix.linux_arm64 + M configure.ac + M src/common/classes/DbImplementation.cpp + M src/common/common.h + M src/jrd/inf_pub.h +Arm64 port + 2014-05-21 17:11 asfernandes M doc/sql.extensions/README.identity_columns.txt Fixed DOC-92 - Values for rdb$identity_type not correct in release notes. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-05-22 13:18:48 UTC (rev 59618) +++ firebird/trunk/src/jrd/build_no.h 2014-05-23 00:28:39 UTC (rev 59619) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31146 + FORMAL BUILD NUMBER:31148 */ -#define PRODUCT_VER_STRING "3.0.0.31146" -#define FILE_VER_STRING "WI-T3.0.0.31146" -#define LICENSE_VER_STRING "WI-T3.0.0.31146" -#define FILE_VER_NUMBER 3, 0, 0, 31146 +#define PRODUCT_VER_STRING "3.0.0.31148" +#define FILE_VER_STRING "WI-T3.0.0.31148" +#define LICENSE_VER_STRING "WI-T3.0.0.31148" +#define FILE_VER_NUMBER 3, 0, 0, 31148 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31146" +#define FB_BUILD_NO "31148" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-05-22 13:18:48 UTC (rev 59618) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-05-23 00:28:39 UTC (rev 59619) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31146 +BuildNum=31148 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-05-24 00:55:29
|
Revision: 59623 http://sourceforge.net/p/firebird/code/59623 Author: firebirds Date: 2014-05-24 00:55:25 +0000 (Sat, 24 May 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-05-23 02:12:56 UTC (rev 59622) +++ firebird/trunk/ChangeLog 2014-05-24 00:55:25 UTC (rev 59623) @@ -1,3 +1,14 @@ + 2014-05-23 02:12 asfernandes + M src/common/MsgMetadata.h + M src/dsql/ExprNodes.cpp + M src/jrd/PreparedStatement.cpp + M src/jrd/dpm.epp + M src/jrd/nbak.cpp + M src/jrd/nbak.h + M src/jrd/recsrc/Cursor.cpp + M src/jrd/recsrc/Cursor.h +Misc. + 2014-05-22 13:18 alexpeshkoff M src/auth/SecureRemotePassword/manage/SrpManagement.cpp M src/auth/SecureRemotePassword/server/SrpServer.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-05-23 02:12:56 UTC (rev 59622) +++ firebird/trunk/src/jrd/build_no.h 2014-05-24 00:55:25 UTC (rev 59623) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31148 + FORMAL BUILD NUMBER:31149 */ -#define PRODUCT_VER_STRING "3.0.0.31148" -#define FILE_VER_STRING "WI-T3.0.0.31148" -#define LICENSE_VER_STRING "WI-T3.0.0.31148" -#define FILE_VER_NUMBER 3, 0, 0, 31148 +#define PRODUCT_VER_STRING "3.0.0.31149" +#define FILE_VER_STRING "WI-T3.0.0.31149" +#define LICENSE_VER_STRING "WI-T3.0.0.31149" +#define FILE_VER_NUMBER 3, 0, 0, 31149 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31148" +#define FB_BUILD_NO "31149" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-05-23 02:12:56 UTC (rev 59622) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-05-24 00:55:25 UTC (rev 59623) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31148 +BuildNum=31149 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-05-25 00:32:45
|
Revision: 59627 http://sourceforge.net/p/firebird/code/59627 Author: firebirds Date: 2014-05-25 00:32:41 +0000 (Sun, 25 May 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-05-24 08:12:34 UTC (rev 59626) +++ firebird/trunk/ChangeLog 2014-05-25 00:32:41 UTC (rev 59627) @@ -1,3 +1,12 @@ + 2014-05-24 08:12 robocop + M src/jrd/nbak.cpp + M src/jrd/nbak.h +Misc. + + 2014-05-24 06:12 robocop + M doc/sql.extensions/README.identity_columns.txt +Misc. + 2014-05-23 02:12 asfernandes M src/common/MsgMetadata.h M src/dsql/ExprNodes.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-05-24 08:12:34 UTC (rev 59626) +++ firebird/trunk/src/jrd/build_no.h 2014-05-25 00:32:41 UTC (rev 59627) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31149 + FORMAL BUILD NUMBER:31151 */ -#define PRODUCT_VER_STRING "3.0.0.31149" -#define FILE_VER_STRING "WI-T3.0.0.31149" -#define LICENSE_VER_STRING "WI-T3.0.0.31149" -#define FILE_VER_NUMBER 3, 0, 0, 31149 +#define PRODUCT_VER_STRING "3.0.0.31151" +#define FILE_VER_STRING "WI-T3.0.0.31151" +#define LICENSE_VER_STRING "WI-T3.0.0.31151" +#define FILE_VER_NUMBER 3, 0, 0, 31151 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31149" +#define FB_BUILD_NO "31151" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-05-24 08:12:34 UTC (rev 59626) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-05-25 00:32:41 UTC (rev 59627) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31149 +BuildNum=31151 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-05-27 00:45:22
|
Revision: 59629 http://sourceforge.net/p/firebird/code/59629 Author: firebirds Date: 2014-05-27 00:45:20 +0000 (Tue, 27 May 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-05-26 23:10:10 UTC (rev 59628) +++ firebird/trunk/ChangeLog 2014-05-27 00:45:20 UTC (rev 59629) @@ -1,3 +1,7 @@ + 2014-05-26 23:10 asfernandes + M src/dsql/StmtNodes.cpp +Fixed the problem reported in CORE-4403 comment. + 2014-05-24 08:12 robocop M src/jrd/nbak.cpp M src/jrd/nbak.h Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-05-26 23:10:10 UTC (rev 59628) +++ firebird/trunk/src/jrd/build_no.h 2014-05-27 00:45:20 UTC (rev 59629) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31151 + FORMAL BUILD NUMBER:31152 */ -#define PRODUCT_VER_STRING "3.0.0.31151" -#define FILE_VER_STRING "WI-T3.0.0.31151" -#define LICENSE_VER_STRING "WI-T3.0.0.31151" -#define FILE_VER_NUMBER 3, 0, 0, 31151 +#define PRODUCT_VER_STRING "3.0.0.31152" +#define FILE_VER_STRING "WI-T3.0.0.31152" +#define LICENSE_VER_STRING "WI-T3.0.0.31152" +#define FILE_VER_NUMBER 3, 0, 0, 31152 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31151" +#define FB_BUILD_NO "31152" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-05-26 23:10:10 UTC (rev 59628) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-05-27 00:45:20 UTC (rev 59629) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31151 +BuildNum=31152 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-05-29 00:58:27
|
Revision: 59638 http://sourceforge.net/p/firebird/code/59638 Author: firebirds Date: 2014-05-29 00:58:23 +0000 (Thu, 29 May 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-05-28 14:59:38 UTC (rev 59637) +++ firebird/trunk/ChangeLog 2014-05-29 00:58:23 UTC (rev 59638) @@ -1,3 +1,7 @@ + 2014-05-28 14:59 asfernandes + M src/utilities/fbsvcmgr/fbsvcmgr.cpp +Apply patch "Removed white space before bracket" by Jiri Cincura. + 2014-05-26 23:10 asfernandes M src/dsql/StmtNodes.cpp Fixed the problem reported in CORE-4403 comment. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-05-28 14:59:38 UTC (rev 59637) +++ firebird/trunk/src/jrd/build_no.h 2014-05-29 00:58:23 UTC (rev 59638) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31152 + FORMAL BUILD NUMBER:31153 */ -#define PRODUCT_VER_STRING "3.0.0.31152" -#define FILE_VER_STRING "WI-T3.0.0.31152" -#define LICENSE_VER_STRING "WI-T3.0.0.31152" -#define FILE_VER_NUMBER 3, 0, 0, 31152 +#define PRODUCT_VER_STRING "3.0.0.31153" +#define FILE_VER_STRING "WI-T3.0.0.31153" +#define LICENSE_VER_STRING "WI-T3.0.0.31153" +#define FILE_VER_NUMBER 3, 0, 0, 31153 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31152" +#define FB_BUILD_NO "31153" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-05-28 14:59:38 UTC (rev 59637) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-05-29 00:58:23 UTC (rev 59638) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31152 +BuildNum=31153 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-05-30 00:34:01
|
Revision: 59647 http://sourceforge.net/p/firebird/code/59647 Author: firebirds Date: 2014-05-30 00:33:54 +0000 (Fri, 30 May 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-05-29 12:15:21 UTC (rev 59646) +++ firebird/trunk/ChangeLog 2014-05-30 00:33:54 UTC (rev 59647) @@ -1,3 +1,7 @@ + 2014-05-29 07:19 dimitr + M src/jrd/tra.cpp +Totally misc. + 2014-05-28 14:59 asfernandes M src/utilities/fbsvcmgr/fbsvcmgr.cpp Apply patch "Removed white space before bracket" by Jiri Cincura. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-05-29 12:15:21 UTC (rev 59646) +++ firebird/trunk/src/jrd/build_no.h 2014-05-30 00:33:54 UTC (rev 59647) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31153 + FORMAL BUILD NUMBER:31154 */ -#define PRODUCT_VER_STRING "3.0.0.31153" -#define FILE_VER_STRING "WI-T3.0.0.31153" -#define LICENSE_VER_STRING "WI-T3.0.0.31153" -#define FILE_VER_NUMBER 3, 0, 0, 31153 +#define PRODUCT_VER_STRING "3.0.0.31154" +#define FILE_VER_STRING "WI-T3.0.0.31154" +#define LICENSE_VER_STRING "WI-T3.0.0.31154" +#define FILE_VER_NUMBER 3, 0, 0, 31154 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31153" +#define FB_BUILD_NO "31154" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-05-29 12:15:21 UTC (rev 59646) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-05-30 00:33:54 UTC (rev 59647) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31153 +BuildNum=31154 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-05 00:40:28
|
Revision: 59658 http://sourceforge.net/p/firebird/code/59658 Author: firebirds Date: 2014-06-05 00:40:23 +0000 (Thu, 05 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-04 09:51:26 UTC (rev 59657) +++ firebird/trunk/ChangeLog 2014-06-05 00:40:23 UTC (rev 59658) @@ -1,3 +1,7 @@ + 2014-06-04 09:51 dimitr + M src/dsql/StmtNodes.cpp +Fixed CORE-4447: Positioned UPDATE statement prohibits index usage for the subsequent cursor field references. + 2014-05-29 07:19 dimitr M src/jrd/tra.cpp Totally misc. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-04 09:51:26 UTC (rev 59657) +++ firebird/trunk/src/jrd/build_no.h 2014-06-05 00:40:23 UTC (rev 59658) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31154 + FORMAL BUILD NUMBER:31155 */ -#define PRODUCT_VER_STRING "3.0.0.31154" -#define FILE_VER_STRING "WI-T3.0.0.31154" -#define LICENSE_VER_STRING "WI-T3.0.0.31154" -#define FILE_VER_NUMBER 3, 0, 0, 31154 +#define PRODUCT_VER_STRING "3.0.0.31155" +#define FILE_VER_STRING "WI-T3.0.0.31155" +#define LICENSE_VER_STRING "WI-T3.0.0.31155" +#define FILE_VER_NUMBER 3, 0, 0, 31155 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31154" +#define FB_BUILD_NO "31155" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-04 09:51:26 UTC (rev 59657) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-05 00:40:23 UTC (rev 59658) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31154 +BuildNum=31155 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...> - 2014-06-06 10:29:27
|
Revision: 59659 http://sourceforge.net/p/firebird/code/59659 Author: alexpeshkoff Date: 2014-06-06 10:29:23 +0000 (Fri, 06 Jun 2014) Log Message: ----------- Avoid loading <string> by ICU Modified Paths: -------------- firebird/trunk/builds/posix/make.android.arme firebird/trunk/builds/posix/make.rules firebird/trunk/src/include/cross/android.arme firebird/trunk/src/include/firebird.h Modified: firebird/trunk/builds/posix/make.android.arme =================================================================== --- firebird/trunk/builds/posix/make.android.arme 2014-06-05 00:40:23 UTC (rev 59658) +++ firebird/trunk/builds/posix/make.android.arme 2014-06-06 10:29:23 UTC (rev 59659) @@ -5,10 +5,15 @@ NDK_ROOT:=$(NDK) NDK_LOG:=1 include $(NDK)/build/core/init.mk -NDK_TOOLCHAIN_VERSION:= 4.6 +TOOLCHAIN_DIR:=$(foreach chain, $(NDK_ALL_TOOLCHAINS), $(if $(findstring arm, $(chain)), $(chain), )) +TOOLCHAIN_DIR:=$(strip $(TOOLCHAIN_DIR)) +ifeq ($(HOST_TAG64),) +HOST_TAG64:=linux-x86 +endif +NDK_TOOLCHAIN_VERSION:=$(shell echo $(TOOLCHAIN_DIR) | awk -F - '{print $$NF;}') CROSS_PLATFORM:=$(NDK)/platforms/android-9/arch-arm -CROSS_PREFIX:=$(NDK)/toolchains/arm-linux-androideabi-$(NDK_TOOLCHAIN_VERSION)/prebuilt/$(HOST_TAG64)/bin/arm-linux-androideabi- +CROSS_PREFIX:=$(NDK)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG64)/bin/arm-linux-androideabi- CXX:=$(CROSS_PREFIX)g++ CC:=$(CROSS_PREFIX)gcc @@ -23,17 +28,17 @@ COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DANDROID -DARM -pipe -MMD -fPIC -fmessage-length=0 \ -I$(ROOT)/extern/libtommath --sysroot=$(CROSS_PLATFORM) \ - -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer + -I/usr/include +OPTIMIZE_FLAGS=-O0 -fno-omit-frame-pointer # optimizing cause bugs... - i.e. -O0 WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS) -#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) CROSS_CONFIG=android.arme -LDFLAGS += --sysroot=$(CROSS_PLATFORM) -L$(NDK)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/armeabi +LDFLAGS += --sysroot=$(CROSS_PLATFORM) -L$(NDK)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/armeabi \ + -L$(NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi DroidLibs := -lm -ldl -lsupc++ LINK_LIBS = $(DroidLibs) Modified: firebird/trunk/builds/posix/make.rules =================================================================== --- firebird/trunk/builds/posix/make.rules 2014-06-05 00:40:23 UTC (rev 59658) +++ firebird/trunk/builds/posix/make.rules 2014-06-06 10:29:23 UTC (rev 59659) @@ -35,9 +35,9 @@ WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include $(CPPFLAGS) ifeq ($(TARGET),Release) - WFLAGS:= $(PROD_FLAGS) $(WFLAGS) + WFLAGS:= $(WFLAGS) $(PROD_FLAGS) else - WFLAGS:= $(DEV_FLAGS) $(WFLAGS) -DDEV_BUILD + WFLAGS:= $(WFLAGS) $(DEV_FLAGS) -DDEV_BUILD endif WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS) $(GLOB_OPTIONS) Modified: firebird/trunk/src/include/cross/android.arme =================================================================== --- firebird/trunk/src/include/cross/android.arme 2014-06-05 00:40:23 UTC (rev 59658) +++ firebird/trunk/src/include/cross/android.arme 2014-06-06 10:29:23 UTC (rev 59659) @@ -368,6 +368,9 @@ /* Define to 1 if you have the <signal.h> header file. */ #define HAVE_SIGNAL_H 1 +/* Define to 1 if you have the `sigset' function. */ +#define HAVE_SIGSET 1 + /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 Modified: firebird/trunk/src/include/firebird.h =================================================================== --- firebird/trunk/src/include/firebird.h 2014-06-05 00:40:23 UTC (rev 59658) +++ firebird/trunk/src/include/firebird.h 2014-06-06 10:29:23 UTC (rev 59659) @@ -75,4 +75,7 @@ #define TRUSTED_AUTH #endif +// We do not use std::string +#define U_HAVE_STD_STRING 0 + #endif // INCLUDE_Firebird_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-07 00:44:39
|
Revision: 59662 http://sourceforge.net/p/firebird/code/59662 Author: firebirds Date: 2014-06-07 00:44:34 +0000 (Sat, 07 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-06 10:42:04 UTC (rev 59661) +++ firebird/trunk/ChangeLog 2014-06-07 00:44:34 UTC (rev 59662) @@ -1,3 +1,14 @@ + 2014-06-06 10:41 alexpeshkoff + M src/jrd/extds/InternalDS.cpp +Use GlobalPtr for static variable doing memory allocation + + 2014-06-06 10:29 alexpeshkoff + M builds/posix/make.android.arme + M builds/posix/make.rules + M src/include/cross/android.arme + M src/include/firebird.h +Avoid loading <string> by ICU + 2014-06-04 09:51 dimitr M src/dsql/StmtNodes.cpp Fixed CORE-4447: Positioned UPDATE statement prohibits index usage for the subsequent cursor field references. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-06 10:42:04 UTC (rev 59661) +++ firebird/trunk/src/jrd/build_no.h 2014-06-07 00:44:34 UTC (rev 59662) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31155 + FORMAL BUILD NUMBER:31157 */ -#define PRODUCT_VER_STRING "3.0.0.31155" -#define FILE_VER_STRING "WI-T3.0.0.31155" -#define LICENSE_VER_STRING "WI-T3.0.0.31155" -#define FILE_VER_NUMBER 3, 0, 0, 31155 +#define PRODUCT_VER_STRING "3.0.0.31157" +#define FILE_VER_STRING "WI-T3.0.0.31157" +#define LICENSE_VER_STRING "WI-T3.0.0.31157" +#define FILE_VER_NUMBER 3, 0, 0, 31157 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31155" +#define FB_BUILD_NO "31157" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-06 10:42:04 UTC (rev 59661) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-07 00:44:34 UTC (rev 59662) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31155 +BuildNum=31157 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-09 00:33:24
|
Revision: 59668 http://sourceforge.net/p/firebird/code/59668 Author: firebirds Date: 2014-06-09 00:33:18 +0000 (Mon, 09 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-08 20:28:16 UTC (rev 59667) +++ firebird/trunk/ChangeLog 2014-06-09 00:33:18 UTC (rev 59668) @@ -1,3 +1,11 @@ + 2014-06-08 01:55 asfernandes + M src/dsql/DdlNodes.epp +Misc. + + 2014-06-08 01:53 asfernandes + M src/dsql/DdlNodes.epp +Fixed CORE-4453 - Regression: NOT NULL constraint, declared in domain, does not work. + 2014-06-06 10:41 alexpeshkoff M src/jrd/extds/InternalDS.cpp Use GlobalPtr for static variable doing memory allocation Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-08 20:28:16 UTC (rev 59667) +++ firebird/trunk/src/jrd/build_no.h 2014-06-09 00:33:18 UTC (rev 59668) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31157 + FORMAL BUILD NUMBER:31159 */ -#define PRODUCT_VER_STRING "3.0.0.31157" -#define FILE_VER_STRING "WI-T3.0.0.31157" -#define LICENSE_VER_STRING "WI-T3.0.0.31157" -#define FILE_VER_NUMBER 3, 0, 0, 31157 +#define PRODUCT_VER_STRING "3.0.0.31159" +#define FILE_VER_STRING "WI-T3.0.0.31159" +#define LICENSE_VER_STRING "WI-T3.0.0.31159" +#define FILE_VER_NUMBER 3, 0, 0, 31159 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31157" +#define FB_BUILD_NO "31159" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-08 20:28:16 UTC (rev 59667) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-09 00:33:18 UTC (rev 59668) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31157 +BuildNum=31159 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hv...@us...> - 2014-06-10 09:01:01
|
Revision: 59679 http://sourceforge.net/p/firebird/code/59679 Author: hvlad Date: 2014-06-10 09:00:58 +0000 (Tue, 10 Jun 2014) Log Message: ----------- Front ported support for fallocate() call on Linux. Front ported improvement CORE-4443 : Use fast file grow on those Linux systems which supports it Modified Paths: -------------- firebird/trunk/configure.ac firebird/trunk/src/jrd/os/pio.h firebird/trunk/src/jrd/os/posix/unix.cpp firebird/trunk/src/jrd/pag.cpp firebird/trunk/src/jrd/pag.h Modified: firebird/trunk/configure.ac =================================================================== --- firebird/trunk/configure.ac 2014-06-10 07:13:34 UTC (rev 59678) +++ firebird/trunk/configure.ac 2014-06-10 09:00:58 UTC (rev 59679) @@ -690,6 +690,7 @@ AC_CHECK_HEADERS(langinfo.h) AC_CHECK_HEADERS(iconv.h) AC_CHECK_HEADERS(libio.h) +AC_CHECK_HEADERS(linux/falloc.h) dnl check for ICU presence AC_CHECK_HEADER(unicode/ucnv.h,,AC_MSG_ERROR(ICU support not found - please install development ICU package)) Modified: firebird/trunk/src/jrd/os/pio.h =================================================================== --- firebird/trunk/src/jrd/os/pio.h 2014-06-10 07:13:34 UTC (rev 59678) +++ firebird/trunk/src/jrd/os/pio.h 2014-06-10 09:00:58 UTC (rev 59679) @@ -94,6 +94,7 @@ const USHORT FIL_no_fs_cache = 2; // not using file system cache const USHORT FIL_readonly = 4; // file opened in readonly mode const USHORT FIL_sh_write = 8; // file opened in shared write mode +const USHORT FIL_no_fast_extend = 16; // file not supports fast extending // Physical IO trace events Modified: firebird/trunk/src/jrd/os/posix/unix.cpp =================================================================== --- firebird/trunk/src/jrd/os/posix/unix.cpp 2014-06-10 07:13:34 UTC (rev 59678) +++ firebird/trunk/src/jrd/os/posix/unix.cpp 2014-06-10 09:00:58 UTC (rev 59679) @@ -45,6 +45,9 @@ #ifdef HAVE_AIO_H #include <aio.h> #endif +#ifdef HAVE_LINUX_FALLOC_H +#include <linux/falloc.h> +#endif #include "../jrd/jrd.h" #include "../jrd/os/pio.h" @@ -291,7 +294,7 @@ } -void PIO_extend(Database* dbb, jrd_file* /*main_file*/, const ULONG /*extPages*/, const USHORT /*pageSize*/) +void PIO_extend(Database* dbb, jrd_file* main_file, const ULONG extPages, const USHORT pageSize) { /************************************** * @@ -303,6 +306,56 @@ * Extend file by extPages pages of pageSize size. * **************************************/ + +#ifdef HAVE_LINUX_FALLOC_H + ULONG leftPages = extPages; + for (jrd_file* file = main_file; file && leftPages; file = file->fil_next) + { + const ULONG filePages = PIO_get_number_of_pages(file, pageSize); + const ULONG fileMaxPages = (file->fil_max_page == MAX_ULONG) ? + MAX_ULONG : file->fil_max_page - file->fil_min_page + 1; + if (filePages < fileMaxPages) + { + if (file->fil_flags & FIL_no_fast_extend) + return; + + const ULONG extendBy = MIN(fileMaxPages - filePages + file->fil_fudge, leftPages); + + int r; + for (r = 0; r < IO_RETRY; r++) + { + int err = fallocate(file->fil_desc, 0, filePages * pageSize, extendBy * pageSize); + if (err == 0) + break; + + err = errno; + if (SYSCALL_INTERRUPTED(err)) + continue; + + if (err == EOPNOTSUPP || err == ENOSYS) + file->fil_flags |= FIL_no_fast_extend; + else + unix_error("fallocate", file, isc_io_write_err); + return; + } + + if (r == IO_RETRY) + { +#ifdef DEV_BUILD + fprintf(stderr, "PIO_extend: retry count exceeded\n"); + fflush(stderr); +#endif + unix_error("fallocate_retry", file, isc_io_write_err); + return; + } + + leftPages -= extendBy; + } + } +#else + main_file->fil_flags |= FIL_no_fast_extend; +#endif // HAVE_LINUX_FALLOC_H + // not implemented return; } Modified: firebird/trunk/src/jrd/pag.cpp =================================================================== --- firebird/trunk/src/jrd/pag.cpp 2014-06-10 07:13:34 UTC (rev 59678) +++ firebird/trunk/src/jrd/pag.cpp 2014-06-10 09:00:58 UTC (rev 59679) @@ -640,7 +640,7 @@ // At this point we ensure database has at least "initialized" pages // allocated. To avoid file growth by few pages when all this space // will be used, extend file up to initialized + next_init_pages now - pageSpace->extend(tdbb, initialized + next_init_pages); + pageSpace->extend(tdbb, initialized + next_init_pages, false); } break; // Found a page and successfully fake-ed it @@ -2039,7 +2039,7 @@ return pgSpace->lastUsedPage(); } -bool PageSpace::extend(thread_db* tdbb, const ULONG pageNum) +bool PageSpace::extend(thread_db* tdbb, const ULONG pageNum, const bool forceSize) { /************************************** * @@ -2051,12 +2051,16 @@ * If "DatabaseGrowthIncrement" is less than MIN_EXTEND_BYTES then don't * extend file(s) * + * If forceSize is true, extend file up to pageNum pages (despite of value + * of "DatabaseGrowthIncrement") and don't make attempts to extend by less + * pages. + * **************************************/ fb_assert(dbb == tdbb->getDatabase()); const int MAX_EXTEND_BYTES = dbb->dbb_config->getDatabaseGrowthIncrement(); - if (pageNum < maxPageNumber || MAX_EXTEND_BYTES < MIN_EXTEND_BYTES) + if (pageNum < maxPageNumber || MAX_EXTEND_BYTES < MIN_EXTEND_BYTES && !forceSize) return true; if (pageNum >= maxAlloc()) @@ -2071,6 +2075,7 @@ while (true) { + const ULONG oldMaxPageNumber = maxPageNumber; try { PIO_extend(dbb, file, extPages, dbb->dbb_page_size); @@ -2078,10 +2083,16 @@ } catch (const status_exception&) { - if (extPages > reqPages) + if (extPages > reqPages && !forceSize) { + fb_utils::init_status(tdbb->tdbb_status_vector); + + // if file was extended, return, else try to extend by less pages + + if (oldMaxPageNumber < maxAlloc()) + return true; + extPages = MAX(reqPages, extPages / 2); - fb_utils::init_status(tdbb->tdbb_status_vector); } else { Modified: firebird/trunk/src/jrd/pag.h =================================================================== --- firebird/trunk/src/jrd/pag.h 2014-06-10 07:13:34 UTC (rev 59678) +++ firebird/trunk/src/jrd/pag.h 2014-06-10 09:00:58 UTC (rev 59679) @@ -120,7 +120,7 @@ static ULONG lastUsedPage(const Database* dbb); // extend page space - bool extend(thread_db*, const ULONG); + bool extend(thread_db*, const ULONG, const bool); // get SCN's page number ULONG getSCNPageNum(ULONG sequence); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-11 00:33:23
|
Revision: 59692 http://sourceforge.net/p/firebird/code/59692 Author: firebirds Date: 2014-06-11 00:33:19 +0000 (Wed, 11 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-10 20:27:42 UTC (rev 59691) +++ firebird/trunk/ChangeLog 2014-06-11 00:33:19 UTC (rev 59692) @@ -1,3 +1,76 @@ + 2014-06-10 15:48 asfernandes + M src/jrd/SysFunction.cpp +Fixed CORE-4457 - DATEADD should support fractional value for MILLISECOND. + + 2014-06-10 15:04 alexpeshkoff + M src/yvalve/why.cpp +Fixed transactions leak caused by my recent commit + + 2014-06-10 13:32 dimitr + M src/include/gen/ids.h + + 2014-06-10 13:32 dimitr + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/DatabaseSnapshot.h + M src/jrd/fields.h + M src/jrd/names.h + M src/jrd/relations.h +Improvement CORE-2303: Include plan in MON$STATEMENTS. + + 2014-06-10 11:33 hvlad + M src/jrd/GlobalRWLock.cpp + M src/jrd/GlobalRWLock.h + M src/jrd/nbak.cpp + M src/jrd/nbak.h +Front ported: +fix for bug CORE-4444 : Engine could hung and block all attachments in out of disk space condition during physical backup, +improvement CORE-4445 : Extend main database file faster when physical backup state changed from stalled to merge + + 2014-06-10 09:31 hvlad + M src/jrd/cch.cpp + M src/jrd/jrd.cpp +Front ported fix for bug CORE-4444 : Engine could hung and block all attachments in out of disk space condition during physical backup + + 2014-06-10 09:00 hvlad + M configure.ac + M src/jrd/os/pio.h + M src/jrd/os/posix/unix.cpp + M src/jrd/pag.cpp + M src/jrd/pag.h +Front ported support for fallocate() call on Linux. +Front ported improvement CORE-4443 : Use fast file grow on those Linux systems which supports it + + 2014-06-10 07:13 alexpeshkoff + M src/common/MsgMetadata.h + M src/common/StatementMetadata.h + M src/common/classes/ImplementHelper.h + M src/jrd/Attachment.cpp + M src/jrd/Attachment.h + M src/jrd/CryptoManager.cpp + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/EngineInterface.h + M src/jrd/ExtEngineManager.cpp + M src/jrd/Mapping.cpp + M src/jrd/cch.cpp + M src/jrd/extds/ExtDS.cpp + M src/jrd/extds/InternalDS.cpp + M src/jrd/jrd.cpp + M src/jrd/jrd.h + M src/jrd/lck.cpp + M src/jrd/lck.h + M src/jrd/shut.cpp + M src/jrd/tra.cpp + M src/jrd/vio.cpp + M src/remote/client/interface.cpp + M src/yvalve/PluginManager.cpp + M src/yvalve/YObjects.h + M src/yvalve/why.cpp +Fixed CORE-4435: After calling release() for attachment to database (instead detach) in embedded mode attachment remains active forever (and some cleanup re. reference counters) + + 2014-06-10 07:06 alexpeshkoff + M src/remote/server/server.cpp +Avoid shutdown delay when all logins appear wrong due to closed security database + 2014-06-08 01:55 asfernandes M src/dsql/DdlNodes.epp Misc. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-10 20:27:42 UTC (rev 59691) +++ firebird/trunk/src/jrd/build_no.h 2014-06-11 00:33:19 UTC (rev 59692) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31159 + FORMAL BUILD NUMBER:31168 */ -#define PRODUCT_VER_STRING "3.0.0.31159" -#define FILE_VER_STRING "WI-T3.0.0.31159" -#define LICENSE_VER_STRING "WI-T3.0.0.31159" -#define FILE_VER_NUMBER 3, 0, 0, 31159 +#define PRODUCT_VER_STRING "3.0.0.31168" +#define FILE_VER_STRING "WI-T3.0.0.31168" +#define LICENSE_VER_STRING "WI-T3.0.0.31168" +#define FILE_VER_NUMBER 3, 0, 0, 31168 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31159" +#define FB_BUILD_NO "31168" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-10 20:27:42 UTC (rev 59691) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-11 00:33:19 UTC (rev 59692) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31159 +BuildNum=31168 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-12 00:29:41
|
Revision: 59696 http://sourceforge.net/p/firebird/code/59696 Author: firebirds Date: 2014-06-12 00:29:33 +0000 (Thu, 12 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-11 15:39:45 UTC (rev 59695) +++ firebird/trunk/ChangeLog 2014-06-12 00:29:33 UTC (rev 59696) @@ -1,3 +1,13 @@ + 2014-06-11 15:39 asfernandes + M src/common/cvt.cpp +Avoid warnings. + + 2014-06-11 15:21 asfernandes + M src/common/classes/NoThrowTimeStamp.cpp + M src/common/classes/NoThrowTimeStamp.h + M src/jrd/SysFunction.cpp +Fixed the Windows build. + 2014-06-10 15:48 asfernandes M src/jrd/SysFunction.cpp Fixed CORE-4457 - DATEADD should support fractional value for MILLISECOND. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-11 15:39:45 UTC (rev 59695) +++ firebird/trunk/src/jrd/build_no.h 2014-06-12 00:29:33 UTC (rev 59696) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31168 + FORMAL BUILD NUMBER:31170 */ -#define PRODUCT_VER_STRING "3.0.0.31168" -#define FILE_VER_STRING "WI-T3.0.0.31168" -#define LICENSE_VER_STRING "WI-T3.0.0.31168" -#define FILE_VER_NUMBER 3, 0, 0, 31168 +#define PRODUCT_VER_STRING "3.0.0.31170" +#define FILE_VER_STRING "WI-T3.0.0.31170" +#define LICENSE_VER_STRING "WI-T3.0.0.31170" +#define FILE_VER_NUMBER 3, 0, 0, 31170 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31168" +#define FB_BUILD_NO "31170" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-11 15:39:45 UTC (rev 59695) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-12 00:29:33 UTC (rev 59696) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31168 +BuildNum=31170 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-13 00:29:46
|
Revision: 59701 http://sourceforge.net/p/firebird/code/59701 Author: firebirds Date: 2014-06-13 00:29:43 +0000 (Fri, 13 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-12 15:56:47 UTC (rev 59700) +++ firebird/trunk/ChangeLog 2014-06-13 00:29:43 UTC (rev 59701) @@ -1,3 +1,19 @@ + 2014-06-12 15:44 asfernandes + M src/intl/lc_narrow.cpp + M src/jrd/idx.cpp +Fixed CORE-4417 - gbak: cannot commit index ; primary key with german umlaut. + + 2014-06-12 14:26 hvlad + M src/jrd/ntrace.h + M src/jrd/trace/TraceObjects.cpp + M src/jrd/trace/TraceObjects.h + M src/utilities/ntrace/TracePluginImpl.cpp + M src/utilities/ntrace/fbtrace.conf + M src/utilities/ntrace/paramtable.h +Implement improvement CORE-4451 : Allow output to trace explain plan form +New boolean setting was added into fbtrace.conf: explain_plan. +See also comments at fbtrace.conf nearby explain_plan. + 2014-06-11 15:39 asfernandes M src/common/cvt.cpp Avoid warnings. Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-12 15:56:47 UTC (rev 59700) +++ firebird/trunk/src/jrd/build_no.h 2014-06-13 00:29:43 UTC (rev 59701) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31170 + FORMAL BUILD NUMBER:31172 */ -#define PRODUCT_VER_STRING "3.0.0.31170" -#define FILE_VER_STRING "WI-T3.0.0.31170" -#define LICENSE_VER_STRING "WI-T3.0.0.31170" -#define FILE_VER_NUMBER 3, 0, 0, 31170 +#define PRODUCT_VER_STRING "3.0.0.31172" +#define FILE_VER_STRING "WI-T3.0.0.31172" +#define LICENSE_VER_STRING "WI-T3.0.0.31172" +#define FILE_VER_NUMBER 3, 0, 0, 31172 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31170" +#define FB_BUILD_NO "31172" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-12 15:56:47 UTC (rev 59700) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-13 00:29:43 UTC (rev 59701) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31170 +BuildNum=31172 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-14 00:33:18
|
Revision: 59707 http://sourceforge.net/p/firebird/code/59707 Author: firebirds Date: 2014-06-14 00:33:14 +0000 (Sat, 14 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-13 16:28:22 UTC (rev 59706) +++ firebird/trunk/ChangeLog 2014-06-14 00:33:14 UTC (rev 59707) @@ -1,3 +1,28 @@ + 2014-06-13 16:28 dimitr + M src/dsql/ExprNodes.cpp + M src/jrd/Attachment.cpp + M src/jrd/Attachment.h + M src/jrd/RecordSourceNodes.cpp + M src/jrd/dfw.epp + M src/jrd/dpm.epp + M src/jrd/idx.cpp + M src/jrd/jrd.cpp + M src/jrd/par.cpp + M src/jrd/recsrc/FullTableScan.cpp + M src/jrd/scl.epp + M src/jrd/vio.cpp +Minor structure changes. + + 2014-06-13 11:28 dimitr + M src/jrd/jrd.cpp + M src/jrd/jrd.h + M src/jrd/met.epp +Frontported CORE-3305: "BLOB not found" error after creation/altering of the invalid trigger. + + 2014-06-13 11:20 hvlad + M src/utilities/ntrace/fbtrace.conf +Fixed a typo + 2014-06-12 15:44 asfernandes M src/intl/lc_narrow.cpp M src/jrd/idx.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-13 16:28:22 UTC (rev 59706) +++ firebird/trunk/src/jrd/build_no.h 2014-06-14 00:33:14 UTC (rev 59707) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31172 + FORMAL BUILD NUMBER:31175 */ -#define PRODUCT_VER_STRING "3.0.0.31172" -#define FILE_VER_STRING "WI-T3.0.0.31172" -#define LICENSE_VER_STRING "WI-T3.0.0.31172" -#define FILE_VER_NUMBER 3, 0, 0, 31172 +#define PRODUCT_VER_STRING "3.0.0.31175" +#define FILE_VER_STRING "WI-T3.0.0.31175" +#define LICENSE_VER_STRING "WI-T3.0.0.31175" +#define FILE_VER_NUMBER 3, 0, 0, 31175 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31172" +#define FB_BUILD_NO "31175" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-13 16:28:22 UTC (rev 59706) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-14 00:33:14 UTC (rev 59707) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31172 +BuildNum=31175 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-17 00:40:38
|
Revision: 59713 http://sourceforge.net/p/firebird/code/59713 Author: firebirds Date: 2014-06-17 00:40:31 +0000 (Tue, 17 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-16 16:04:55 UTC (rev 59712) +++ firebird/trunk/ChangeLog 2014-06-17 00:40:31 UTC (rev 59713) @@ -1,3 +1,12 @@ + 2014-06-16 16:04 asfernandes + A doc/sql.extensions/README.cursor_variables.txt + M doc/sql.extensions/README.cursors +Documentation for CORE-4403 - Allow referencing cursors as record variables in PSQL. + + 2014-06-16 13:49 alexpeshkoff + M src/utilities/nbackup/nbackup.cpp +Fixed CORE-4461: nbackup prints error messages to stdout instead stderr + 2014-06-13 16:28 dimitr M src/dsql/ExprNodes.cpp M src/jrd/Attachment.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-16 16:04:55 UTC (rev 59712) +++ firebird/trunk/src/jrd/build_no.h 2014-06-17 00:40:31 UTC (rev 59713) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31175 + FORMAL BUILD NUMBER:31177 */ -#define PRODUCT_VER_STRING "3.0.0.31175" -#define FILE_VER_STRING "WI-T3.0.0.31175" -#define LICENSE_VER_STRING "WI-T3.0.0.31175" -#define FILE_VER_NUMBER 3, 0, 0, 31175 +#define PRODUCT_VER_STRING "3.0.0.31177" +#define FILE_VER_STRING "WI-T3.0.0.31177" +#define LICENSE_VER_STRING "WI-T3.0.0.31177" +#define FILE_VER_NUMBER 3, 0, 0, 31177 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31175" +#define FB_BUILD_NO "31177" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-16 16:04:55 UTC (rev 59712) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-17 00:40:31 UTC (rev 59713) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31175 +BuildNum=31177 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...> - 2014-06-17 10:28:08
|
Revision: 59716 http://sourceforge.net/p/firebird/code/59716 Author: alexpeshkoff Date: 2014-06-17 10:27:59 +0000 (Tue, 17 Jun 2014) Log Message: ----------- Implemented CORE-4462 (Make it possible to restore compressed .nbk files without explicitly decompressing them) for POSIX systems 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/msgs/facilities2.sql firebird/trunk/src/msgs/messages2.sql firebird/trunk/src/msgs/system_errors2.sql firebird/trunk/src/utilities/nbackup/nbackup.cpp firebird/trunk/src/utilities/nbackup/nbkswi.h Modified: firebird/trunk/lang_helpers/gds_codes.ftn =================================================================== --- firebird/trunk/lang_helpers/gds_codes.ftn 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/lang_helpers/gds_codes.ftn 2014-06-17 10:27:59 UTC (rev 59716) @@ -2488,6 +2488,8 @@ PARAMETER (GDS__nbackup_switchd_parameter = 337117255) INTEGER*4 GDS__nbackup_user_stop PARAMETER (GDS__nbackup_user_stop = 337117257) + INTEGER*4 GDS__nbackup_deco_parse + PARAMETER (GDS__nbackup_deco_parse = 337117259) INTEGER*4 GDS__trace_conflict_acts PARAMETER (GDS__trace_conflict_acts = 337182750) INTEGER*4 GDS__trace_act_notfound Modified: firebird/trunk/lang_helpers/gds_codes.pas =================================================================== --- firebird/trunk/lang_helpers/gds_codes.pas 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/lang_helpers/gds_codes.pas 2014-06-17 10:27:59 UTC (rev 59716) @@ -1251,6 +1251,7 @@ gds_nbackup_lostguid_l0bk = 337117251; gds_nbackup_switchd_parameter = 337117255; gds_nbackup_user_stop = 337117257; + gds_nbackup_deco_parse = 337117259; gds_trace_conflict_acts = 337182750; gds_trace_act_notfound = 337182751; gds_trace_switch_once = 337182752; Modified: firebird/trunk/src/include/gen/codetext.h =================================================================== --- firebird/trunk/src/include/gen/codetext.h 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/include/gen/codetext.h 2014-06-17 10:27:59 UTC (rev 59716) @@ -1240,6 +1240,7 @@ {"nbackup_lostguid_l0bk", 337117251}, {"nbackup_switchd_parameter", 337117255}, {"nbackup_user_stop", 337117257}, + {"nbackup_deco_parse", 337117259}, {"trace_conflict_acts", 337182750}, {"trace_act_notfound", 337182751}, {"trace_switch_once", 337182752}, Modified: firebird/trunk/src/include/gen/iberror.h =================================================================== --- firebird/trunk/src/include/gen/iberror.h 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/include/gen/iberror.h 2014-06-17 10:27:59 UTC (rev 59716) @@ -1274,6 +1274,7 @@ const ISC_STATUS isc_nbackup_lostguid_l0bk = 337117251L; const ISC_STATUS isc_nbackup_switchd_parameter = 337117255L; const ISC_STATUS isc_nbackup_user_stop = 337117257L; +const ISC_STATUS isc_nbackup_deco_parse = 337117259L; const ISC_STATUS isc_trace_conflict_acts = 337182750L; const ISC_STATUS isc_trace_act_notfound = 337182751L; const ISC_STATUS isc_trace_switch_once = 337182752L; @@ -1285,7 +1286,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 = 1229; +const ISC_STATUS isc_err_max = 1230; #else /* c definitions */ @@ -2529,6 +2530,7 @@ #define isc_nbackup_lostguid_l0bk 337117251L #define isc_nbackup_switchd_parameter 337117255L #define isc_nbackup_user_stop 337117257L +#define isc_nbackup_deco_parse 337117259L #define isc_trace_conflict_acts 337182750L #define isc_trace_act_notfound 337182751L #define isc_trace_switch_once 337182752L @@ -2540,7 +2542,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 1229 +#define isc_err_max 1230 #endif Modified: firebird/trunk/src/include/gen/msgs.h =================================================================== --- firebird/trunk/src/include/gen/msgs.h 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/include/gen/msgs.h 2014-06-17 10:27:59 UTC (rev 59716) @@ -1243,6 +1243,7 @@ {337117251, "Cannot get backup guid clumplet from L0 backup"}, /* nbackup_lostguid_l0bk */ {337117255, "Wrong parameter @1 for switch -D, need ON or OFF"}, /* nbackup_switchd_parameter */ {337117257, "Terminated due to user request"}, /* nbackup_user_stop */ + {337117259, "Too complex decompress command (> @1 arguments)"}, /* nbackup_deco_parse */ {337182750, "conflicting actions \"@1\" and \"@2\" found"}, /* trace_conflict_acts */ {337182751, "action switch not found"}, /* trace_act_notfound */ {337182752, "switch \"@1\" must be set only once"}, /* trace_switch_once */ Modified: firebird/trunk/src/include/gen/sql_code.h =================================================================== --- firebird/trunk/src/include/gen/sql_code.h 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/include/gen/sql_code.h 2014-06-17 10:27:59 UTC (rev 59716) @@ -1239,6 +1239,7 @@ {337117251, -901}, /* 67 nbackup_lostguid_l0bk */ {337117255, -901}, /* 71 nbackup_switchd_parameter */ {337117257, -901}, /* 73 nbackup_user_stop */ + {337117259, -901}, /* 75 nbackup_deco_parse */ {337182750, -901}, /* 30 trace_conflict_acts */ {337182751, -901}, /* 31 trace_act_notfound */ {337182752, -901}, /* 32 trace_switch_once */ Modified: firebird/trunk/src/include/gen/sql_state.h =================================================================== --- firebird/trunk/src/include/gen/sql_state.h 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/include/gen/sql_state.h 2014-06-17 10:27:59 UTC (rev 59716) @@ -1239,6 +1239,7 @@ {337117251, "00000"}, // 67 nbackup_lostguid_l0bk {337117255, "00000"}, // 71 nbackup_switchd_parameter {337117257, "08006"}, // 73 nbackup_user_stop + {337117259, "54023"}, // 75 nbackup_deco_parse {337182750, "00000"}, // 30 trace_conflict_acts {337182751, "00000"}, // 31 trace_act_notfound {337182752, "00000"}, // 32 trace_switch_once Modified: firebird/trunk/src/msgs/facilities2.sql =================================================================== --- firebird/trunk/src/msgs/facilities2.sql 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/msgs/facilities2.sql 2014-06-17 10:27:59 UTC (rev 59716) @@ -18,7 +18,7 @@ ('2012-05-25 19:59:42', 'GSTAT', 21, 56) ('2013-12-19 17:31:31', 'FBSVCMGR', 22, 58) ('2009-07-18 12:12:12', 'UTL', 23, 2) -('2011-05-25 16:17:34', 'NBACKUP', 24, 74) +('2014-06-16 18:16:16', 'NBACKUP', 24, 76) ('2009-07-20 07:55:48', 'FBTRACEMGR', 25, 41) stop Modified: firebird/trunk/src/msgs/messages2.sql =================================================================== --- firebird/trunk/src/msgs/messages2.sql 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/msgs/messages2.sql 2014-06-17 10:27:59 UTC (rev 59716) @@ -3301,6 +3301,8 @@ ('nbackup_switchd_parameter', 'main', 'nbackup.cpp', NULL, 24, 71, NULL, 'Wrong parameter @1 for switch -D, need ON or OFF', NULL, NULL) (NULL, 'usage', 'nbackup.cpp', NULL, 24, 72, NULL, 'special options are:', NULL, NULL) ('nbackup_user_stop', 'checkCtrlC()', 'nbackup.cpp', NULL, 24, 73, NULL, 'Terminated due to user request', NULL, NULL) +(NULL, 'usage', 'nbackup.cpp', NULL, 24, 74, NULL, ' -DE(COMPRESS) <command> Command to extract archives during restore', NULL, NULL) +('nbackup_deco_parse', 'NBackup::open_backup_scan', 'nbackup.cpp', NULL, 24, 75, NULL, 'Too complex decompress command (> @1 arguments)', NULL, NULL) -- FBTRACEMGR -- All messages use the new format. (NULL, 'usage', 'TraceCmdLine.cpp', NULL, 25, 1, NULL, 'Firebird Trace Manager version @1', NULL, NULL) Modified: firebird/trunk/src/msgs/system_errors2.sql =================================================================== --- firebird/trunk/src/msgs/system_errors2.sql 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/msgs/system_errors2.sql 2014-06-17 10:27:59 UTC (rev 59716) @@ -1238,6 +1238,7 @@ (-901, '00', '000', 24, 67, 'nbackup_lostguid_l0bk', NULL, NULL) (-901, '00', '000', 24, 71, 'nbackup_switchd_parameter', NULL, NULL) (-901, '08', '006', 24, 73, 'nbackup_user_stop', NULL, NULL) +(-901, '54', '023', 24, 75, 'nbackup_deco_parse', NULL, NULL) -- FBTRACEMGR (-901, '00', '000', 25, 30, 'trace_conflict_acts', NULL, NULL) (-901, '00', '000', 25, 31, 'trace_act_notfound', NULL, NULL) Modified: firebird/trunk/src/utilities/nbackup/nbackup.cpp =================================================================== --- firebird/trunk/src/utilities/nbackup/nbackup.cpp 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/utilities/nbackup/nbackup.cpp 2014-06-17 10:27:59 UTC (rev 59716) @@ -65,6 +65,14 @@ #include <errno.h> #endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif + #ifndef O_LARGEFILE #define O_LARGEFILE 0 #endif @@ -266,11 +274,12 @@ public: NBackup(UtilSvc* _uSvc, const PathName& _database, const string& _username, const string& _password, bool _run_db_triggers/*, const string& _trustedUser, - bool _trustedRole*/, bool _direct_io) + bool _trustedRole*/, bool _direct_io, const PathName& _deco) : uSvc(_uSvc), newdb(0), trans(0), database(_database), username(_username), password(_password), /*trustedUser(_trustedUser),*/ run_db_triggers(_run_db_triggers), /*trustedRole(_trustedRole), */direct_io(_direct_io), - dbase(0), backup(0), db_size_pages(0), m_odsNumber(0), m_silent(false), m_printed(false) + dbase(0), backup(0), decompress(_deco), childId(0), db_size_pages(0), + m_odsNumber(0), m_silent(false), m_printed(false) { // Recognition of local prefix allows to work with // database using TCP/IP loopback while reading file locally. @@ -325,6 +334,8 @@ PathName bakname; FILE_HANDLE dbase; FILE_HANDLE backup; + PathName decompress; + int childId; ULONG db_size_pages; // In pages USHORT m_odsNumber; bool m_silent; // are we already handling an exception? @@ -363,11 +374,6 @@ DWORD bytesDone; if (ReadFile(file, buffer, bufsize, &bytesDone, NULL)) return bytesDone; -#else - const ssize_t res = read(file, buffer, bufsize); - if (res >= 0) - return res; -#endif status_exception::raise(Arg::Gds(isc_nbackup_err_read) << (&file == &dbase ? dbname.c_str() : @@ -375,6 +381,30 @@ Arg::OsError()); return 0; // silence compiler +#else + size_t rc = 0; + while (bufsize) + { + const ssize_t res = read(file, buffer, bufsize); + if (res < 0) + status_exception::raise(Arg::Gds(isc_nbackup_err_read) << + (&file == &dbase ? dbname.c_str() : + &file == &backup ? bakname.c_str() : "unknown") << + Arg::OsError()); + + if (!res) + break; + + rc += res; + bufsize -= res; + buffer = &((UCHAR*) buffer)[res]; + } + + return rc; +#endif + + + return 0; // silence compiler } void NBackup::write_file(FILE_HANDLE &file, void *buffer, size_t bufsize) @@ -543,9 +573,79 @@ if (backup != INVALID_HANDLE_VALUE) return; #else - backup = open(nm.c_str(), O_RDONLY | O_LARGEFILE); - if (backup >= 0) + if (decompress.hasData()) + { + PathName command = decompress; + PathName::size_type n = command.find('@'); + if (n == PathName::npos) + { + command += ' '; + command += bakname; + } + else + { + command.replace(n, 1, bakname); + } + + const unsigned ARGCOUNT = 20; + unsigned narg = 0; + char* args[ARGCOUNT + 1]; + bool inStr = false; + for(unsigned i = 0; i < command.length(); ++i) + { + switch(command[i]) + { + case ' ': + case '\t': + command[i] = '\0'; + inStr = false; + break; + default: + if (!inStr) + { + if (narg >= ARGCOUNT) + { + status_exception::raise(Arg::Gds(isc_nbackup_deco_parse) << Arg::Num(ARGCOUNT)); + } + inStr = true; + args[narg++] = &command[i]; + } + break; + } + } + args[narg] = NULL; + + int pfd[2]; + if (pipe(pfd) < 0) + system_call_failed::raise("pipe"); + + fb_assert(!newdb); // FB 2.5 & 3 can't fork when attached to database + childId = fork(); + if (childId < 0) + system_call_failed::raise("fork"); + + if (childId == 0) + { + close(pfd[0]); + dup2(pfd[1], 1); + close(pfd[1]); + + execvp(args[0], args); + } + else + { + backup = pfd[0]; + close(pfd[1]); + } + return; + } + else + { + backup = open(nm.c_str(), O_RDONLY | O_LARGEFILE); + if (backup >= 0) + return; + } #endif status_exception::raise(Arg::Gds(isc_nbackup_err_openbk) << bakname.c_str() << Arg::OsError()); @@ -587,6 +687,11 @@ CloseHandle(backup); #else close(backup); + if (childId > 0) + { + wait(NULL); + childId = 0; + } #endif } @@ -1459,7 +1564,7 @@ NbOperation op = nbNone; string username, password; - PathName database, filename; + PathName database, filename, decompress; bool run_db_triggers = true; bool direct_io = #ifdef WIN_NT @@ -1541,6 +1646,13 @@ usage(uSvc, isc_nbackup_switchd_parameter, onOff.c_str()); break; + case IN_SW_NBK_DECOMPRESS: + if (++itr >= argc) + missingParameterForSwitch(uSvc, argv[itr - 1]); + + decompress = argv[itr]; + break; + case IN_SW_NBK_FIXUP: if (op != nbNone) singleAction(uSvc); @@ -1670,7 +1782,7 @@ usage(uSvc, isc_nbackup_size_with_lock); } - NBackup nbk(uSvc, database, username, password, run_db_triggers, /*trustedUser, trustedRole, */direct_io); + NBackup nbk(uSvc, database, username, password, run_db_triggers, /*trustedUser, trustedRole, */direct_io, decompress); try { switch (op) Modified: firebird/trunk/src/utilities/nbackup/nbkswi.h =================================================================== --- firebird/trunk/src/utilities/nbackup/nbkswi.h 2014-06-17 09:53:09 UTC (rev 59715) +++ firebird/trunk/src/utilities/nbackup/nbkswi.h 2014-06-17 10:27:59 UTC (rev 59716) @@ -48,6 +48,7 @@ const int IN_SW_NBK_TRUSTED_ROLE = 13; const int IN_SW_NBK_HELP = 14; const int IN_SW_NBK_DIRECT = 15; +const int IN_SW_NBK_DECOMPRESS = 16; static const struct Switches::in_sw_tab_t nbackup_in_sw_table [] = @@ -61,7 +62,7 @@ static const struct Switches::in_sw_tab_t nbackup_action_in_sw_table [] = { - {IN_SW_NBK_LOCK, 0, "LOCK", 0, 0, 0, false, 8, 1, NULL ,nboExclusive}, + {IN_SW_NBK_LOCK, 0, "LOCK", 0, 0, 0, false, 8, 1, NULL, nboExclusive}, {IN_SW_NBK_UNLOCK, 0, "N", 0, 0, 0, false, 0, 1, NULL, nboExclusive}, {IN_SW_NBK_UNLOCK, 0, "UNLOCK", 0, 0, 0, false, 9, 2, NULL, nboExclusive}, {IN_SW_NBK_FIXUP, 0, "FIXUP", 0, 0, 0, false, 10, 1, NULL, nboExclusive}, @@ -69,6 +70,7 @@ {IN_SW_NBK_RESTORE, isc_action_svc_nrest, "RESTORE", 0, 0, 0, false, 12, 1, NULL, nboExclusive}, {IN_SW_NBK_DIRECT, 0, "DIRECT", 0, 0, 0, false, 70, 1, NULL, nboSpecial}, {IN_SW_NBK_SIZE, 0, "SIZE", 0, 0, 0, false, 17, 1, NULL, nboSpecial}, + {IN_SW_NBK_DECOMPRESS, 0, "DECOMPRESS", 0, 0, 0, false, 74, 2, NULL, nboSpecial}, {IN_SW_NBK_NODBTRIG, 0, "T", 0, 0, 0, false, 0, 1, NULL, nboGeneral}, {IN_SW_NBK_NODBTRIG, 0, "NODBTRIGGERS", 0, 0, 0, false, 16, 3, NULL, nboGeneral}, {IN_SW_NBK_USER_NAME, 0, "USER", 0, 0, 0, false, 13, 1, NULL, nboGeneral}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-18 00:43:10
|
Revision: 59725 http://sourceforge.net/p/firebird/code/59725 Author: firebirds Date: 2014-06-18 00:43:02 +0000 (Wed, 18 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-17 20:57:07 UTC (rev 59724) +++ firebird/trunk/ChangeLog 2014-06-18 00:43:02 UTC (rev 59725) @@ -1,3 +1,26 @@ + 2014-06-17 12:45 alexpeshkoff + M src/yvalve/utl.cpp +Fixed CORE-4440: isql crash without connect when execute command "show version" + + 2014-06-17 10:27 alexpeshkoff + M lang_helpers/gds_codes.ftn + M lang_helpers/gds_codes.pas + M src/include/gen/codetext.h + M src/include/gen/iberror.h + M src/include/gen/msgs.h + M src/include/gen/sql_code.h + M src/include/gen/sql_state.h + M src/msgs/facilities2.sql + M src/msgs/messages2.sql + M src/msgs/system_errors2.sql + M src/utilities/nbackup/nbackup.cpp + M src/utilities/nbackup/nbkswi.h +Implemented CORE-4462 (Make it possible to restore compressed .nbk files without explicitly decompressing them) for POSIX systems + + 2014-06-17 09:53 alexpeshkoff + M src/utilities/nbackup/nbackup.cpp +Postfix for CORE-4461: do not poison backup file with statistics + 2014-06-16 16:04 asfernandes A doc/sql.extensions/README.cursor_variables.txt M doc/sql.extensions/README.cursors Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-17 20:57:07 UTC (rev 59724) +++ firebird/trunk/src/jrd/build_no.h 2014-06-18 00:43:02 UTC (rev 59725) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31177 + FORMAL BUILD NUMBER:31180 */ -#define PRODUCT_VER_STRING "3.0.0.31177" -#define FILE_VER_STRING "WI-T3.0.0.31177" -#define LICENSE_VER_STRING "WI-T3.0.0.31177" -#define FILE_VER_NUMBER 3, 0, 0, 31177 +#define PRODUCT_VER_STRING "3.0.0.31180" +#define FILE_VER_STRING "WI-T3.0.0.31180" +#define LICENSE_VER_STRING "WI-T3.0.0.31180" +#define FILE_VER_NUMBER 3, 0, 0, 31180 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31177" +#define FB_BUILD_NO "31180" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-17 20:57:07 UTC (rev 59724) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-18 00:43:02 UTC (rev 59725) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31177 +BuildNum=31180 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-19 00:36:48
|
Revision: 59729 http://sourceforge.net/p/firebird/code/59729 Author: firebirds Date: 2014-06-19 00:36:40 +0000 (Thu, 19 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-18 12:20:29 UTC (rev 59728) +++ firebird/trunk/ChangeLog 2014-06-19 00:36:40 UTC (rev 59729) @@ -1,3 +1,7 @@ + 2014-06-18 12:20 alexpeshkoff + M src/common/common.h +Front-ported needed AIX port changes + 2014-06-17 12:45 alexpeshkoff M src/yvalve/utl.cpp Fixed CORE-4440: isql crash without connect when execute command "show version" Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-18 12:20:29 UTC (rev 59728) +++ firebird/trunk/src/jrd/build_no.h 2014-06-19 00:36:40 UTC (rev 59729) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31180 + FORMAL BUILD NUMBER:31181 */ -#define PRODUCT_VER_STRING "3.0.0.31180" -#define FILE_VER_STRING "WI-T3.0.0.31180" -#define LICENSE_VER_STRING "WI-T3.0.0.31180" -#define FILE_VER_NUMBER 3, 0, 0, 31180 +#define PRODUCT_VER_STRING "3.0.0.31181" +#define FILE_VER_STRING "WI-T3.0.0.31181" +#define LICENSE_VER_STRING "WI-T3.0.0.31181" +#define FILE_VER_NUMBER 3, 0, 0, 31181 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31180" +#define FB_BUILD_NO "31181" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-18 12:20:29 UTC (rev 59728) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-19 00:36:40 UTC (rev 59729) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31180 +BuildNum=31181 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-20 00:40:12
|
Revision: 59737 http://sourceforge.net/p/firebird/code/59737 Author: firebirds Date: 2014-06-20 00:40:07 +0000 (Fri, 20 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-19 21:04:50 UTC (rev 59736) +++ firebird/trunk/ChangeLog 2014-06-20 00:40:07 UTC (rev 59737) @@ -1,3 +1,18 @@ + 2014-06-19 14:35 alexpeshkoff + M src/jrd/jrd.cpp +Totally misc - we had too many things called "init" in jrd.cpp + + 2014-06-19 12:44 alexpeshkoff + M src/common/common.h +Current HPUX reported to support __thread + + 2014-06-19 12:25 alexpeshkoff + M src/common/classes/alloc.cpp + M src/common/classes/alloc.h + M src/common/classes/fb_tls.h + M src/common/classes/init.cpp +HPUX port - fixed assertion for RISC machines with compiler missing __thread support + 2014-06-18 12:20 alexpeshkoff M src/common/common.h Front-ported needed AIX port changes Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-19 21:04:50 UTC (rev 59736) +++ firebird/trunk/src/jrd/build_no.h 2014-06-20 00:40:07 UTC (rev 59737) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31181 + FORMAL BUILD NUMBER:31184 */ -#define PRODUCT_VER_STRING "3.0.0.31181" -#define FILE_VER_STRING "WI-T3.0.0.31181" -#define LICENSE_VER_STRING "WI-T3.0.0.31181" -#define FILE_VER_NUMBER 3, 0, 0, 31181 +#define PRODUCT_VER_STRING "3.0.0.31184" +#define FILE_VER_STRING "WI-T3.0.0.31184" +#define LICENSE_VER_STRING "WI-T3.0.0.31184" +#define FILE_VER_NUMBER 3, 0, 0, 31184 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31181" +#define FB_BUILD_NO "31184" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-19 21:04:50 UTC (rev 59736) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-20 00:40:07 UTC (rev 59737) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31181 +BuildNum=31184 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <asf...@us...> - 2014-06-20 02:28:32
|
Revision: 59739 http://sourceforge.net/p/firebird/code/59739 Author: asfernandes Date: 2014-06-20 02:28:22 +0000 (Fri, 20 Jun 2014) Log Message: ----------- Misc. Modified Paths: -------------- firebird/trunk/doc/sql.extensions/README.cursor_variables.txt firebird/trunk/src/common/classes/alloc.cpp firebird/trunk/src/jrd/Attachment.cpp firebird/trunk/src/jrd/DatabaseSnapshot.cpp firebird/trunk/src/jrd/Mapping.cpp firebird/trunk/src/jrd/jrd.cpp firebird/trunk/src/jrd/nbak.cpp firebird/trunk/src/jrd/os/posix/unix.cpp firebird/trunk/src/utilities/nbackup/nbackup.cpp firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp firebird/trunk/src/yvalve/why.cpp Modified: firebird/trunk/doc/sql.extensions/README.cursor_variables.txt =================================================================== --- firebird/trunk/doc/sql.extensions/README.cursor_variables.txt 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/doc/sql.extensions/README.cursor_variables.txt 2014-06-20 02:28:22 UTC (rev 59739) @@ -6,7 +6,7 @@ Allow usage of explicit or implicit cursors without needing the use of INTO clause in FETCH and FOR SELECT. An explicit cursor automatically becomes a cursor variable. - An implicit cursor (FOR SELECT) needs the {AS CURSOR <name>} clause. + An implicit cursor (FOR SELECT) needs the {AS CURSOR <name>} clause to become a cursor variable. Author: Adriano dos Santos Fernandes <adr...@gm...> @@ -20,7 +20,8 @@ 3) It's allowed to use the colon prefix with trigger's NEW and OLD contexts. 4) Cursor variables are read-only. 5) A FOR SELECT without AS CURSOR needs the use of INTO, while with AS CURSOR it's not required, - but still allowed. + but still allowed. With FETCH, INTO is now optional. + 6) It's allowed now to use the colon prefix when assigning to variables or NEW's fields. Examples: 1. Modified: firebird/trunk/src/common/classes/alloc.cpp =================================================================== --- firebird/trunk/src/common/classes/alloc.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/common/classes/alloc.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -1096,7 +1096,7 @@ TLS_DECLARE(MemoryPool*, contextPool); #else TLS_DECLARE(MemoryPool*, *contextPoolPtr); -#endif //TLS_CLASS +#endif // TLS_CLASS MemoryPool* MemoryPool::setContextPool(MemoryPool* newPool) { @@ -1106,7 +1106,7 @@ #else MemoryPool* const old = TLS_GET(*contextPoolPtr); TLS_SET(*contextPoolPtr, newPool); -#endif //TLS_CLASS +#endif // TLS_CLASS return old; } @@ -1116,7 +1116,7 @@ return TLS_GET(contextPool); #else return TLS_GET(*contextPoolPtr); -#endif //TLS_CLASS +#endif // TLS_CLASS } void MemoryPool::contextPoolInit() @@ -1125,7 +1125,7 @@ // Allocate TLS entry for context pool contextPoolPtr = FB_NEW(*getDefaultMemoryPool()) TLS_CLASS<MemoryPool*>; // To be deleted by InstanceControl::InstanceList::destructors() at TLS priority -#endif //TLS_CLASS +#endif // TLS_CLASS } MemoryPool& AutoStorage::getAutoMemoryPool() Modified: firebird/trunk/src/jrd/Attachment.cpp =================================================================== --- firebird/trunk/src/jrd/Attachment.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/jrd/Attachment.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -77,7 +77,7 @@ fb_assert(sAtt); if (sAtt) { - // break link between attachment and it's stable part + // break link between attachment and its stable part sAtt->cancel(); attachment->setStable(NULL); Modified: firebird/trunk/src/jrd/DatabaseSnapshot.cpp =================================================================== --- firebird/trunk/src/jrd/DatabaseSnapshot.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/jrd/DatabaseSnapshot.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -914,7 +914,7 @@ const jrd_req* const request = *i; if (!(request->getStatement()->flags & - (JrdStatement::FLAG_INTERNAL | JrdStatement::FLAG_SYS_TRIGGER))) + (JrdStatement::FLAG_INTERNAL | JrdStatement::FLAG_SYS_TRIGGER))) { const string plan = OPT_get_plan(tdbb, request, true); putRequest(record, request, writer, fb_utils::genUniqueId(), plan); Modified: firebird/trunk/src/jrd/Mapping.cpp =================================================================== --- firebird/trunk/src/jrd/Mapping.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/jrd/Mapping.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -899,142 +899,138 @@ try { - for (;;) - { - if (syncType == SYNC_EXCLUSIVE) + for (;;) { - DispatcherPtr prov; - - ClumpletWriter embeddedSysdba(ClumpletWriter::Tagged, - MAX_DPB_SIZE, isc_dpb_version1); - embeddedSysdba.insertString(isc_dpb_user_name, SYSDBA_USER_NAME, - strlen(SYSDBA_USER_NAME)); - embeddedSysdba.insertByte(isc_dpb_sec_attach, TRUE); - embeddedSysdba.insertByte(isc_dpb_no_db_triggers, TRUE); - - if (!iSec) + if (syncType == SYNC_EXCLUSIVE) { - iSec = prov->attachDatabase(&st, securityAlias, - embeddedSysdba.getBufferLength(), embeddedSysdba.getBuffer()); - if (!st.isSuccess()) - { - if (!fb_utils::containsErrorCode(st.get(), isc_io_error)) - check("IProvider::attachDatabase", &st); + DispatcherPtr prov; - // missing security DB is not a reason to fail mapping - iSec = NULL; - } - } + ClumpletWriter embeddedSysdba(ClumpletWriter::Tagged, + MAX_DPB_SIZE, isc_dpb_version1); + embeddedSysdba.insertString(isc_dpb_user_name, SYSDBA_USER_NAME, + strlen(SYSDBA_USER_NAME)); + embeddedSysdba.insertByte(isc_dpb_sec_attach, TRUE); + embeddedSysdba.insertByte(isc_dpb_no_db_triggers, TRUE); - if (db && !iDb) - { - const char* conf = "Providers=" CURRENT_ENGINE; - embeddedSysdba.insertString(isc_dpb_config, conf, strlen(conf)); - - if (!iDb) + if (!iSec) { - iDb = prov->attachDatabase(&st, alias, + iSec = prov->attachDatabase(&st, securityAlias, embeddedSysdba.getBufferLength(), embeddedSysdba.getBuffer()); + if (!st.isSuccess()) + { + if (!fb_utils::containsErrorCode(st.get(), isc_io_error)) + check("IProvider::attachDatabase", &st); + + // missing security DB is not a reason to fail mapping + iSec = NULL; + } } - if (!st.isSuccess()) + if (db && !iDb) { - if (!fb_utils::containsErrorCode(st.get(), isc_io_error)) - check("IProvider::attachDatabase", &st); + const char* conf = "Providers=" CURRENT_ENGINE; + embeddedSysdba.insertString(isc_dpb_config, conf, strlen(conf)); - // missing DB is not a reason to fail mapping - iDb = NULL; + if (!iDb) + { + iDb = prov->attachDatabase(&st, alias, + embeddedSysdba.getBufferLength(), embeddedSysdba.getBuffer()); + } + + if (!st.isSuccess()) + { + if (!fb_utils::containsErrorCode(st.get(), isc_io_error)) + check("IProvider::attachDatabase", &st); + + // missing DB is not a reason to fail mapping + iDb = NULL; + } } } - } - MutexEnsureUnlock g(treeMutex, FB_FUNCTION); - g.enter(); + MutexEnsureUnlock g(treeMutex, FB_FUNCTION); + g.enter(); - Cache* cDb = NULL; - if (db) - cDb = locate(alias, db); - Cache* cSec = locate(securityAlias, securityDb); + Cache* cDb = NULL; + if (db) + cDb = locate(alias, db); + Cache* cSec = locate(securityAlias, securityDb); - SyncObject dummySync; - Sync sDb((!(flags & FLAG_DB)) ? &cDb->syncObject : &dummySync, FB_FUNCTION); - Sync sSec((!(flags & FLAG_SEC)) ? &cSec->syncObject : &dummySync, FB_FUNCTION); + SyncObject dummySync; + Sync sDb((!(flags & FLAG_DB)) ? &cDb->syncObject : &dummySync, FB_FUNCTION); + Sync sSec((!(flags & FLAG_SEC)) ? &cSec->syncObject : &dummySync, FB_FUNCTION); - sSec.lock(syncType); - if (!sDb.lockConditional(syncType)) - { - // Avoid deadlocks cause hell knows which db is security for which - sSec.unlock(); - // Now safely wait for sSec - sDb.lock(syncType); - // and repeat whole operation - continue; - } + sSec.lock(syncType); + if (!sDb.lockConditional(syncType)) + { + // Avoid deadlocks cause hell knows which db is security for which + sSec.unlock(); + // Now safely wait for sSec + sDb.lock(syncType); + // and repeat whole operation + continue; + } - // Required cache(s) are locked somehow - release treeMutex - g.leave(); + // Required cache(s) are locked somehow - release treeMutex + g.leave(); - // Check is it required to populate caches from DB - if ((cDb && !cDb->dataFlag) || !cSec->dataFlag) - { - if (syncType != SYNC_EXCLUSIVE) + // Check is it required to populate caches from DB + if ((cDb && !cDb->dataFlag) || !cSec->dataFlag) { - syncType = SYNC_EXCLUSIVE; - sSec.unlock(); - sDb.unlock(); + if (syncType != SYNC_EXCLUSIVE) + { + syncType = SYNC_EXCLUSIVE; + sSec.unlock(); + sDb.unlock(); - continue; + continue; + } + + if (cDb) + cDb->populate(iDb); + cSec->populate(iSec); + + sSec.downgrade(SYNC_SHARED); + sDb.downgrade(SYNC_SHARED); } - if (cDb) - cDb->populate(iDb); - cSec->populate(iSec); + // Caches are ready somehow - proceed with analysis + AuthReader auth(authBlock); - sSec.downgrade(SYNC_SHARED); - sDb.downgrade(SYNC_SHARED); - } + // Map in simple mode first main, next security db + if (cDb && cDb->map4(false, flags & FLAG_DB, auth, info, newBlock)) + break; + if (cSec->map4(false, flags & FLAG_SEC, auth, info, newBlock)) + break; - // Caches are ready somehow - proceed with analysis - AuthReader auth(authBlock); + // Map in wildcard mode first main, next security db + if (cDb && cDb->map4(true, flags & FLAG_DB, auth, info, newBlock)) + break; + cSec->map4(true, flags & FLAG_SEC, auth, info, newBlock); - // Map in simple mode first main, next security db - if (cDb && cDb->map4(false, flags & FLAG_DB, auth, info, newBlock)) break; - if (cSec->map4(false, flags & FLAG_SEC, auth, info, newBlock)) - break; + } - // Map in wildcard mode first main, next security db - if (cDb && cDb->map4(true, flags & FLAG_DB, auth, info, newBlock)) - break; - cSec->map4(true, flags & FLAG_SEC, auth, info, newBlock); - - break; - } - - if (iDb) - { - iDb->detach(&st); - check("IAttachment::detach", &st); - iDb = NULL; - } - if (iSec) - { - iSec->detach(&st); - check("IAttachment::detach", &st); - iSec = NULL; - } + if (iDb) + { + iDb->detach(&st); + check("IAttachment::detach", &st); + iDb = NULL; + } + if (iSec) + { + iSec->detach(&st); + check("IAttachment::detach", &st); + iSec = NULL; + } } - catch(const Exception&) + catch (const Exception&) { - if (iDb) - { - iDb->release(); - } - if (iSec) - { - iSec->release(); - } - throw; + if (iDb) + iDb->release(); + if (iSec) + iSec->release(); + throw; } for (AuthReader rdr(newBlock); rdr.getInfo(info); rdr.moveNext()) Modified: firebird/trunk/src/jrd/jrd.cpp =================================================================== --- firebird/trunk/src/jrd/jrd.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/jrd/jrd.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -6103,7 +6103,7 @@ sAtt->manualLock(attachment->att_flags); jAtt = new JAttachment(sAtt); } - catch(const Exception&) + catch (const Exception&) { sAtt->release(); throw; @@ -7890,7 +7890,8 @@ guard.lock(SYNC_SHARED); for (Jrd::Attachment* attachment = dbb->dbb_attachments; - attachment; attachment = attachment->att_next) + attachment; + attachment = attachment->att_next) { if (attachment->att_flags & ATT_shutdown) { Modified: firebird/trunk/src/jrd/nbak.cpp =================================================================== --- firebird/trunk/src/jrd/nbak.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/jrd/nbak.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -381,7 +381,8 @@ LocalAllocReadGuard localAllocGuard(this); AllocItemTree::Accessor all(alloc_table); - if (all.getFirst()) { + if (all.getFirst()) + { do { const ULONG pg = all.current().db_page; @@ -402,7 +403,7 @@ maxAllocPage = pgSpace->maxAlloc(); while (maxAllocPage < maxPage) { - const USHORT ret = PIO_init_data(database, pgSpace->file, tdbb->tdbb_status_vector, + const USHORT ret = PIO_init_data(database, pgSpace->file, tdbb->tdbb_status_vector, maxAllocPage, 256); if (ret != 256) @@ -410,6 +411,7 @@ maxAllocPage += ret; } + return true; } Modified: firebird/trunk/src/jrd/os/posix/unix.cpp =================================================================== --- firebird/trunk/src/jrd/os/posix/unix.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/jrd/os/posix/unix.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -316,7 +316,7 @@ MAX_ULONG : file->fil_max_page - file->fil_min_page + 1; if (filePages < fileMaxPages) { - if (file->fil_flags & FIL_no_fast_extend) + if (file->fil_flags & FIL_no_fast_extend) return; const ULONG extendBy = MIN(fileMaxPages - filePages + file->fil_fudge, leftPages); Modified: firebird/trunk/src/utilities/nbackup/nbackup.cpp =================================================================== --- firebird/trunk/src/utilities/nbackup/nbackup.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/utilities/nbackup/nbackup.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -387,10 +387,12 @@ { const ssize_t res = read(file, buffer, bufsize); if (res < 0) + { status_exception::raise(Arg::Gds(isc_nbackup_err_read) << (&file == &dbase ? dbname.c_str() : &file == &backup ? bakname.c_str() : "unknown") << Arg::OsError()); + } if (!res) break; @@ -591,9 +593,9 @@ unsigned narg = 0; char* args[ARGCOUNT + 1]; bool inStr = false; - for(unsigned i = 0; i < command.length(); ++i) + for (unsigned i = 0; i < command.length(); ++i) { - switch(command[i]) + switch (command[i]) { case ' ': case '\t': @@ -1325,8 +1327,10 @@ time_t finish = time(NULL); double elapsed = difftime(finish, start); if (bakname != "stdout") + { uSvc->printf(false, "time elapsed\t%.0f sec \npage reads\t%u \npage writes\t%u\n", elapsed, page_reads, page_writes); + } } void NBackup::restore_database(const BackupFiles& files) Modified: firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp =================================================================== --- firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/utilities/ntrace/TracePluginImpl.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -1382,7 +1382,7 @@ } *stmt_data.description += temp; - const char* access_path = config.print_plan ? + const char* access_path = config.print_plan ? (config.explain_plan ? statement->getPlanExplained() : statement->getPlan()) : NULL; Modified: firebird/trunk/src/yvalve/why.cpp =================================================================== --- firebird/trunk/src/yvalve/why.cpp 2014-06-20 00:54:48 UTC (rev 59738) +++ firebird/trunk/src/yvalve/why.cpp 2014-06-20 02:28:22 UTC (rev 59739) @@ -4312,9 +4312,7 @@ outMetadata, outBuffer); if (newTrans == trans) - { newTrans = transaction; - } else { if (transaction) @@ -4324,10 +4322,9 @@ transaction->release(); transaction = NULL; // Get ready for correct return in OOM case } + if (newTrans) - { newTrans = new YTransaction(attachment, newTrans); - } } return newTrans; @@ -5210,9 +5207,7 @@ inMetadata, inBuffer, outMetadata, outBuffer); if (newTrans == trans) - { newTrans = transaction; - } else { if (transaction) @@ -5222,10 +5217,9 @@ transaction->release(); transaction = NULL; // Get ready for correct return in OOM case } + if (newTrans) - { newTrans = new YTransaction(this, newTrans); - } } return newTrans; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-21 00:34:25
|
Revision: 59744 http://sourceforge.net/p/firebird/code/59744 Author: firebirds Date: 2014-06-21 00:34:17 +0000 (Sat, 21 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-20 13:42:50 UTC (rev 59743) +++ firebird/trunk/ChangeLog 2014-06-21 00:34:17 UTC (rev 59744) @@ -1,3 +1,32 @@ + 2014-06-20 10:06 alexpeshkoff + M src/utilities/nbackup/nbackup.cpp +Postfix for CORE-4462: enabled use of filenames with spaces (as requested by Adriano) + + 2014-06-20 05:54 dimitr + M src/jrd/ntrace.h + M src/jrd/trace/TraceObjects.cpp + M src/jrd/trace/TraceObjects.h + M src/utilities/ntrace/TracePluginImpl.cpp +Better naming. + + 2014-06-20 05:20 dimitr + M src/jrd/names.h +Fixed typo. + + 2014-06-20 02:28 asfernandes + M doc/sql.extensions/README.cursor_variables.txt + M src/common/classes/alloc.cpp + M src/jrd/Attachment.cpp + M src/jrd/DatabaseSnapshot.cpp + M src/jrd/Mapping.cpp + M src/jrd/jrd.cpp + M src/jrd/nbak.cpp + M src/jrd/os/posix/unix.cpp + M src/utilities/nbackup/nbackup.cpp + M src/utilities/ntrace/TracePluginImpl.cpp + M src/yvalve/why.cpp +Misc. + 2014-06-19 14:35 alexpeshkoff M src/jrd/jrd.cpp Totally misc - we had too many things called "init" in jrd.cpp Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-20 13:42:50 UTC (rev 59743) +++ firebird/trunk/src/jrd/build_no.h 2014-06-21 00:34:17 UTC (rev 59744) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31184 + FORMAL BUILD NUMBER:31188 */ -#define PRODUCT_VER_STRING "3.0.0.31184" -#define FILE_VER_STRING "WI-T3.0.0.31184" -#define LICENSE_VER_STRING "WI-T3.0.0.31184" -#define FILE_VER_NUMBER 3, 0, 0, 31184 +#define PRODUCT_VER_STRING "3.0.0.31188" +#define FILE_VER_STRING "WI-T3.0.0.31188" +#define LICENSE_VER_STRING "WI-T3.0.0.31188" +#define FILE_VER_NUMBER 3, 0, 0, 31188 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31184" +#define FB_BUILD_NO "31188" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-20 13:42:50 UTC (rev 59743) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-21 00:34:17 UTC (rev 59744) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31184 +BuildNum=31188 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-22 00:30:27
|
Revision: 59749 http://sourceforge.net/p/firebird/code/59749 Author: firebirds Date: 2014-06-22 00:30:23 +0000 (Sun, 22 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-21 18:51:52 UTC (rev 59748) +++ firebird/trunk/ChangeLog 2014-06-22 00:30:23 UTC (rev 59749) @@ -1,3 +1,7 @@ + 2014-06-21 14:07 fsg + M src/isql/extract.epp +let isql ignore packaged functions when extracting external UDF's + 2014-06-20 10:06 alexpeshkoff M src/utilities/nbackup/nbackup.cpp Postfix for CORE-4462: enabled use of filenames with spaces (as requested by Adriano) Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-21 18:51:52 UTC (rev 59748) +++ firebird/trunk/src/jrd/build_no.h 2014-06-22 00:30:23 UTC (rev 59749) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31188 + FORMAL BUILD NUMBER:31189 */ -#define PRODUCT_VER_STRING "3.0.0.31188" -#define FILE_VER_STRING "WI-T3.0.0.31188" -#define LICENSE_VER_STRING "WI-T3.0.0.31188" -#define FILE_VER_NUMBER 3, 0, 0, 31188 +#define PRODUCT_VER_STRING "3.0.0.31189" +#define FILE_VER_STRING "WI-T3.0.0.31189" +#define LICENSE_VER_STRING "WI-T3.0.0.31189" +#define FILE_VER_NUMBER 3, 0, 0, 31189 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31188" +#define FB_BUILD_NO "31189" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-21 18:51:52 UTC (rev 59748) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-22 00:30:23 UTC (rev 59749) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31188 +BuildNum=31189 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fir...@us...> - 2014-06-23 00:30:47
|
Revision: 59755 http://sourceforge.net/p/firebird/code/59755 Author: firebirds Date: 2014-06-23 00:30:44 +0000 (Mon, 23 Jun 2014) Log Message: ----------- nightly update Modified Paths: -------------- firebird/trunk/ChangeLog firebird/trunk/src/jrd/build_no.h firebird/trunk/src/misc/writeBuildNum.sh Modified: firebird/trunk/ChangeLog =================================================================== --- firebird/trunk/ChangeLog 2014-06-22 10:31:27 UTC (rev 59754) +++ firebird/trunk/ChangeLog 2014-06-23 00:30:44 UTC (rev 59755) @@ -1,3 +1,7 @@ + 2014-06-22 02:30 asfernandes + M src/burp/restore.epp +Fixed CORE-4470 - gbak fails to restore database containing dependency between views and packaged functions. + 2014-06-21 14:07 fsg M src/isql/extract.epp let isql ignore packaged functions when extracting external UDF's Modified: firebird/trunk/src/jrd/build_no.h =================================================================== --- firebird/trunk/src/jrd/build_no.h 2014-06-22 10:31:27 UTC (rev 59754) +++ firebird/trunk/src/jrd/build_no.h 2014-06-23 00:30:44 UTC (rev 59755) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:31189 + FORMAL BUILD NUMBER:31190 */ -#define PRODUCT_VER_STRING "3.0.0.31189" -#define FILE_VER_STRING "WI-T3.0.0.31189" -#define LICENSE_VER_STRING "WI-T3.0.0.31189" -#define FILE_VER_NUMBER 3, 0, 0, 31189 +#define PRODUCT_VER_STRING "3.0.0.31190" +#define FILE_VER_STRING "WI-T3.0.0.31190" +#define LICENSE_VER_STRING "WI-T3.0.0.31190" +#define FILE_VER_NUMBER 3, 0, 0, 31190 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31189" +#define FB_BUILD_NO "31190" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2" Modified: firebird/trunk/src/misc/writeBuildNum.sh =================================================================== --- firebird/trunk/src/misc/writeBuildNum.sh 2014-06-22 10:31:27 UTC (rev 59754) +++ firebird/trunk/src/misc/writeBuildNum.sh 2014-06-23 00:30:44 UTC (rev 59755) @@ -9,7 +9,7 @@ MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31189 +BuildNum=31190 NowAt=`pwd` cd `dirname $0` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |