From 44b49e142554ed3ba32f9296e4af93d1b782a702 Mon Sep 17 00:00:00 2001 From: firebirds Date: Thu, 19 Jan 2012 03:27:38 +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 6f34673b5f..8174d12c41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2012-01-18 12:05 alexpeshkoff + M src/burp/restore.epp +Backported fix for CORE-3733: GBAK fails to fix system generators while restoring + 2012-01-17 17:25 dimitr M src/remote/protocol.cpp Hopefully, this should fix CORE-3730: isc_dsql_exec_immed2() loses input parameter value with RETURNING clause. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index e938f6a91a..9953e2f13e 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:26421 + FORMAL BUILD NUMBER:26422 */ -#define PRODUCT_VER_STRING "2.5.2.26421" -#define FILE_VER_STRING "WI-V2.5.2.26421" -#define LICENSE_VER_STRING "WI-V2.5.2.26421" -#define FILE_VER_NUMBER 2, 5, 2, 26421 +#define PRODUCT_VER_STRING "2.5.2.26422" +#define FILE_VER_STRING "WI-V2.5.2.26422" +#define LICENSE_VER_STRING "WI-V2.5.2.26422" +#define FILE_VER_NUMBER 2, 5, 2, 26422 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "2" -#define FB_BUILD_NO "26421" +#define FB_BUILD_NO "26422" #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 1895724191..436e00dd67 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=2 -BuildNum=26421 +BuildNum=26422 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds