From 5c86df7b708c0006e0556287bd0d7b67a84da4ba Mon Sep 17 00:00:00 2001 From: firebirds Date: Wed, 2 Mar 2016 00:21:04 +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 f9e48cfc05..ff4dedb1ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2016-03-01 08:38 firebirds + M mkChangeLog.sh +Fixed changelog/buildno generating script for branch + 2016-02-29 20:12 dimitr M src/dsql/ExprNodes.cpp Fixed CORE-5122: Expression index may not be used by the optimizer if created and used in different connection charsets. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index ef2e0b92f1..164316447d 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:32370 + FORMAL BUILD NUMBER:32371 */ -#define PRODUCT_VER_STRING "3.0.0.32370" -#define FILE_VER_STRING "WI-V3.0.0.32370" -#define LICENSE_VER_STRING "WI-V3.0.0.32370" -#define FILE_VER_NUMBER 3, 0, 0, 32370 +#define PRODUCT_VER_STRING "3.0.0.32371" +#define FILE_VER_STRING "WI-V3.0.0.32371" +#define LICENSE_VER_STRING "WI-V3.0.0.32371" +#define FILE_VER_NUMBER 3, 0, 0, 32371 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "32370" +#define FB_BUILD_NO "32371" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 9022be9f23..d4496f1d3b 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=32370 +BuildNum=32371 NowAt=`pwd` cd `dirname $0`