diff --git a/ChangeLog b/ChangeLog index b03cdd601b..c4d2bb786a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ + 2012-12-03 11:21 dimitr + M src/jrd/btr.cpp + M src/jrd/err.cpp + M src/jrd/idx.cpp + M src/jrd/jrd.cpp + M src/jrd/recsrc/IndexTableScan.cpp +Front-ported bugfixes related to CORE-4004: Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests. + 2012-12-02 01:45 asfernandes M src/common/classes/alloc.cpp M src/jrd/tpc.cpp diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index d8443b4ba7..0ce03c074a 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:30148 + FORMAL BUILD NUMBER:30149 */ -#define PRODUCT_VER_STRING "3.0.0.30148" -#define FILE_VER_STRING "WI-T3.0.0.30148" -#define LICENSE_VER_STRING "WI-T3.0.0.30148" -#define FILE_VER_NUMBER 3, 0, 0, 30148 +#define PRODUCT_VER_STRING "3.0.0.30149" +#define FILE_VER_STRING "WI-T3.0.0.30149" +#define LICENSE_VER_STRING "WI-T3.0.0.30149" +#define FILE_VER_NUMBER 3, 0, 0, 30149 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "30148" +#define FB_BUILD_NO "30149" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 716d8599a7..8e408b73f5 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=T MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=30148 +BuildNum=30149 NowAt=`pwd` cd `dirname $0`