From 4da55b2246e3455d7288e734b602b2518670a0b8 Mon Sep 17 00:00:00 2001 From: firebirds Date: Mon, 3 Jan 2011 03:30:25 +0000 Subject: [PATCH] nightly update --- ChangeLog | 5 +++++ src/jrd/build_no.h | 12 ++++++------ src/misc/writeBuildNum.sh | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40aad58002..b16f67a131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ + 2011-01-02 22:15 hvlad + M src/jrd/exe.cpp +More conservative fix for CORE-3282 : EXECUTE STATEMENT parses the SQL text using wrong charset. +Convert into attachment charset query text only + 2010-12-28 12:01 dimitr M src/jrd/dpm.epp CORE-3295: Estimate the actual record compression ratio in the optimizer. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index bf3d5d7152..7f865a4e3e 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:26160 + FORMAL BUILD NUMBER:26161 */ -#define PRODUCT_VER_STRING "2.5.1.26160" -#define FILE_VER_STRING "WI-V2.5.1.26160" -#define LICENSE_VER_STRING "WI-V2.5.1.26160" -#define FILE_VER_NUMBER 2, 5, 1, 26160 +#define PRODUCT_VER_STRING "2.5.1.26161" +#define FILE_VER_STRING "WI-V2.5.1.26161" +#define LICENSE_VER_STRING "WI-V2.5.1.26161" +#define FILE_VER_NUMBER 2, 5, 1, 26161 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "1" -#define FB_BUILD_NO "26160" +#define FB_BUILD_NO "26161" #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 9e7bc7d1f4..5738083140 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=1 -BuildNum=26160 +BuildNum=26161 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds