From 03b8f80a98b47062ffd97e1d47205fa7d5fd058b Mon Sep 17 00:00:00 2001 From: firebirds Date: Tue, 3 Apr 2012 05:04:40 +0000 Subject: [PATCH] nightly update --- ChangeLog | 4 ++++ src/jrd/build_no.h | 12 ++++++------ src/misc/writeBuildNum.sh | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index deac75442f..4bfa6032a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2012-04-02 15:19 dimitr + M src/jrd/rse.cpp +Fixed CORE-3806: Wrong data returned if a sub-query or a computed field refers to the base table in the ORDER BY clause. + 2012-03-31 15:59 asfernandes M src/burp/restore.epp Fixed CORE-3802 - Firebird runs out of memory while restoring database backup. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index 163cfabb83..4d2160f5ca 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:26456 + FORMAL BUILD NUMBER:26457 */ -#define PRODUCT_VER_STRING "2.5.2.26456" -#define FILE_VER_STRING "WI-V2.5.2.26456" -#define LICENSE_VER_STRING "WI-V2.5.2.26456" -#define FILE_VER_NUMBER 2, 5, 2, 26456 +#define PRODUCT_VER_STRING "2.5.2.26457" +#define FILE_VER_STRING "WI-V2.5.2.26457" +#define LICENSE_VER_STRING "WI-V2.5.2.26457" +#define FILE_VER_NUMBER 2, 5, 2, 26457 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "2" -#define FB_BUILD_NO "26456" +#define FB_BUILD_NO "26457" #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 65c2c1ae4e..c18d5d30bc 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=2 -BuildNum=26456 +BuildNum=26457 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds