From: <fir...@us...> - 2016-02-12 00:13:58
|
Revision: 62962 http://sourceforge.net/p/firebird/code/62962 Author: firebirds Date: 2016-02-12 00:13:55 +0000 (Fri, 12 Feb 2016) Log Message: ----------- nightly update Modified Paths: -------------- firebird/branches/B2_5_Release/ChangeLog firebird/branches/B2_5_Release/src/jrd/build_no.h firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh Modified: firebird/branches/B2_5_Release/ChangeLog =================================================================== --- firebird/branches/B2_5_Release/ChangeLog 2016-02-12 00:09:34 UTC (rev 62961) +++ firebird/branches/B2_5_Release/ChangeLog 2016-02-12 00:13:55 UTC (rev 62962) @@ -1,3 +1,7 @@ + 2016-02-11 12:09 hvlad + M src/jrd/tpc.cpp +Missed check (CORE-5067). + 2016-02-07 11:48 dimitr M src/jrd/jrd.cpp Backported from trunk: unwind the cache if checkCancelState(true) is called directly. Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h =================================================================== --- firebird/branches/B2_5_Release/src/jrd/build_no.h 2016-02-12 00:09:34 UTC (rev 62961) +++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2016-02-12 00:13:55 UTC (rev 62962) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:26971 + FORMAL BUILD NUMBER:26972 */ -#define PRODUCT_VER_STRING "2.5.6.26971" -#define FILE_VER_STRING "WI-V2.5.6.26971" -#define LICENSE_VER_STRING "WI-V2.5.6.26971" -#define FILE_VER_NUMBER 2, 5, 6, 26971 +#define PRODUCT_VER_STRING "2.5.6.26972" +#define FILE_VER_STRING "WI-V2.5.6.26972" +#define LICENSE_VER_STRING "WI-V2.5.6.26972" +#define FILE_VER_NUMBER 2, 5, 6, 26972 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "6" -#define FB_BUILD_NO "26971" +#define FB_BUILD_NO "26972" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.5" Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh =================================================================== --- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2016-02-12 00:09:34 UTC (rev 62961) +++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2016-02-12 00:13:55 UTC (rev 62962) @@ -9,7 +9,7 @@ MajorVer=2 MinorVer=5 RevNo=6 -BuildNum=26971 +BuildNum=26972 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |