diff --git a/ChangeLog b/ChangeLog index 0099c12895..2bce08c429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2015-02-04 14:52 smirnoffjr + M src/jrd/isc_file.cpp +Backported from trunk: small fix for generic UNIX Mnt::get() implementation + 2015-02-03 11:58 alexpeshkoff M src/jrd/isc_file.cpp Backported fix for CORE-4644: Get open database errors under heavy concurrent load diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index a5132cd1a3..c7530478cd 100644 --- a/src/jrd/build_no.h +++ b/src/jrd/build_no.h @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:26834 + FORMAL BUILD NUMBER:26835 */ -#define PRODUCT_VER_STRING "2.5.4.26834" -#define FILE_VER_STRING "WI-V2.5.4.26834" -#define LICENSE_VER_STRING "WI-V2.5.4.26834" -#define FILE_VER_NUMBER 2, 5, 4, 26834 +#define PRODUCT_VER_STRING "2.5.4.26835" +#define FILE_VER_STRING "WI-V2.5.4.26835" +#define LICENSE_VER_STRING "WI-V2.5.4.26835" +#define FILE_VER_NUMBER 2, 5, 4, 26835 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "4" -#define FB_BUILD_NO "26834" +#define FB_BUILD_NO "26835" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.5" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 47f22a3c63..04a0ac4bd2 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=4 -BuildNum=26834 +BuildNum=26835 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds