From d7d7f3670c4194dd501a08aa1df5f6e10c2b346d Mon Sep 17 00:00:00 2001 From: firebirds Date: Mon, 13 Apr 2015 17:02:22 +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 0b367961b1..2f2d58cb75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2015-04-12 21:05 asfernandes + M src/lock/print.cpp +Revert "Remove duplicate lck enums." - broke Windows build as per Dmitry. + 2015-04-11 00:59 asfernandes M src/dsql/DdlNodes.epp Fixed CORE-4744 - ALTER DATABASE SET DEFAULT CHARACTER SET: 1) take effect only for once for current attachment; 2) does not check that new char set exists untill it will be used. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index e309640ca6..b8d8c39b23 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:31784 + FORMAL BUILD NUMBER:31785 */ -#define PRODUCT_VER_STRING "3.0.0.31784" -#define FILE_VER_STRING "WI-T3.0.0.31784" -#define LICENSE_VER_STRING "WI-T3.0.0.31784" -#define FILE_VER_NUMBER 3, 0, 0, 31784 +#define PRODUCT_VER_STRING "3.0.0.31785" +#define FILE_VER_STRING "WI-T3.0.0.31785" +#define LICENSE_VER_STRING "WI-T3.0.0.31785" +#define FILE_VER_NUMBER 3, 0, 0, 31785 #define FB_MAJOR_VER "3" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "31784" +#define FB_BUILD_NO "31785" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 3006bdf723..b3af69b759 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=T MajorVer=3 MinorVer=0 RevNo=0 -BuildNum=31784 +BuildNum=31785 NowAt=`pwd` cd `dirname $0`