From 0fb3676c67a62562fb1fad0745825978d08ab490 Mon Sep 17 00:00:00 2001 From: firebirds Date: Mon, 21 Feb 2011 03:21:28 +0000 Subject: [PATCH] nightly update --- ChangeLog | 6 ++++++ src/jrd/build_no.h | 12 ++++++------ src/misc/writeBuildNum.sh | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2617c88689..65529055f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + 2011-02-20 13:25 dimitr + M src/jrd/Optimizer.cpp + M src/jrd/Optimizer.h + M src/jrd/opt.cpp +Fixed CORE-3176: View with "subselect" column join table and not use index. + 2011-02-18 06:52 dimitr M src/isql/isql.epp Restored the pre-v2.5 logic by the customer request. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index d2987c4263..248a173d2b 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:26220 + FORMAL BUILD NUMBER:26221 */ -#define PRODUCT_VER_STRING "2.5.1.26220" -#define FILE_VER_STRING "WI-V2.5.1.26220" -#define LICENSE_VER_STRING "WI-V2.5.1.26220" -#define FILE_VER_NUMBER 2, 5, 1, 26220 +#define PRODUCT_VER_STRING "2.5.1.26221" +#define FILE_VER_STRING "WI-V2.5.1.26221" +#define LICENSE_VER_STRING "WI-V2.5.1.26221" +#define FILE_VER_NUMBER 2, 5, 1, 26221 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "1" -#define FB_BUILD_NO "26220" +#define FB_BUILD_NO "26221" #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 d8bbe2e7c3..d24555617d 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=1 -BuildNum=26220 +BuildNum=26221 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds