diff --git a/ChangeLog b/ChangeLog index ca044a915e..d36705e72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2010-11-23 12:05 dimitr + M src/dsql/metd.epp +Fixed CORE-3256: Error "request depth exceeded" may appear while preparing a select query against a view with explicit plan. + 2010-11-21 18:14 asfernandes M src/jrd/SysFunction.cpp Backport fixes for: diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index b94ed3783a..e678df7e2e 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:26137 + FORMAL BUILD NUMBER:26138 */ -#define PRODUCT_VER_STRING "2.5.0.26137" -#define FILE_VER_STRING "WI-V2.5.0.26137" -#define LICENSE_VER_STRING "WI-V2.5.0.26137" -#define FILE_VER_NUMBER 2, 5, 0, 26137 +#define PRODUCT_VER_STRING "2.5.0.26138" +#define FILE_VER_STRING "WI-V2.5.0.26138" +#define LICENSE_VER_STRING "WI-V2.5.0.26138" +#define FILE_VER_NUMBER 2, 5, 0, 26138 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "0" -#define FB_BUILD_NO "26137" +#define FB_BUILD_NO "26138" #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 760e552704..87a4e4bbf6 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=0 -BuildNum=26137 +BuildNum=26138 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds