From: <fir...@us...> - 2014-12-03 14:52:24
|
Revision: 60335 http://sourceforge.net/p/firebird/code/60335 Author: firebirds Date: 2014-12-03 14:52:20 +0000 (Wed, 03 Dec 2014) 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 2014-12-03 14:27:11 UTC (rev 60334) +++ firebird/branches/B2_5_Release/ChangeLog 2014-12-03 14:52:20 UTC (rev 60335) @@ -1,3 +1,11 @@ + 2014-12-02 20:14 dimitr + M src/lock/lock.cpp +Fixed CORE-4631: Lock manager "out of room" error hides the real cause of this problem. + + 2014-12-02 10:18 alexpeshkoff + M src/remote/protocol.cpp +Fixed CORE-4630: Segfault in server caused by bad packet + 2014-11-30 15:50 dimitr M src/jrd/vio.cpp Simplest possible fix for CORE-4618: Rollback doesn`t undo changes when MERGE statement updates the same target rows multiple times and PLAN MERGE is used. Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h =================================================================== --- firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-12-03 14:27:11 UTC (rev 60334) +++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2014-12-03 14:52:20 UTC (rev 60335) @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:26818 + FORMAL BUILD NUMBER:26820 */ -#define PRODUCT_VER_STRING "2.5.4.26818" -#define FILE_VER_STRING "WI-V2.5.4.26818" -#define LICENSE_VER_STRING "WI-V2.5.4.26818" -#define FILE_VER_NUMBER 2, 5, 4, 26818 +#define PRODUCT_VER_STRING "2.5.4.26820" +#define FILE_VER_STRING "WI-V2.5.4.26820" +#define LICENSE_VER_STRING "WI-V2.5.4.26820" +#define FILE_VER_NUMBER 2, 5, 4, 26820 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "4" -#define FB_BUILD_NO "26818" +#define FB_BUILD_NO "26820" #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 2014-12-03 14:27:11 UTC (rev 60334) +++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2014-12-03 14:52:20 UTC (rev 60335) @@ -9,7 +9,7 @@ MajorVer=2 MinorVer=5 RevNo=4 -BuildNum=26818 +BuildNum=26820 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. |