diff --git a/ChangeLog b/ChangeLog index 1451199207..1eaffa6c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2013-05-29 12:13 dimitr + M src/dsql/pass1.cpp +Fixed CORE-4107: Wrong resultset (subquery + derived table + union). + 2013-05-23 11:55 alexpeshkoff M src/common/classes/PublicHandle.h M src/jrd/jrd.cpp diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index bf56c2a7c0..ed6b43514e 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:26649 + FORMAL BUILD NUMBER:26650 */ -#define PRODUCT_VER_STRING "2.5.3.26649" -#define FILE_VER_STRING "WI-V2.5.3.26649" -#define LICENSE_VER_STRING "WI-V2.5.3.26649" -#define FILE_VER_NUMBER 2, 5, 3, 26649 +#define PRODUCT_VER_STRING "2.5.3.26650" +#define FILE_VER_STRING "WI-V2.5.3.26650" +#define LICENSE_VER_STRING "WI-V2.5.3.26650" +#define FILE_VER_NUMBER 2, 5, 3, 26650 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "3" -#define FB_BUILD_NO "26649" +#define FB_BUILD_NO "26650" #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 25cf7a3037..45ece388b8 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=3 -BuildNum=26649 +BuildNum=26650 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds