From c2d17063a3539380ff977747ac7c94d601980e4c Mon Sep 17 00:00:00 2001 From: firebirds Date: Sat, 28 Apr 2012 05:12:56 +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 25eb2f3ce9..149f64cde2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2012-04-27 16:30 dimitr + M src/dsql/pass1.cpp +Fixed CORE-3834: Usage of a NATURAL JOIN with a derived table crashes the server. + 2012-04-26 09:39 paulbeach M builds/install/misc/firebird.conf Make the conf. parameter DummyPacketInterval more accurate. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index ece3d9e93e..2aac0a5c71 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:18489 + FORMAL BUILD NUMBER:18490 */ -#define PRODUCT_VER_STRING "2.1.5.18489" -#define FILE_VER_STRING "WI-V2.1.5.18489" -#define LICENSE_VER_STRING "WI-V2.1.5.18489" -#define FILE_VER_NUMBER 2, 1, 5, 18489 +#define PRODUCT_VER_STRING "2.1.5.18490" +#define FILE_VER_STRING "WI-V2.1.5.18490" +#define LICENSE_VER_STRING "WI-V2.1.5.18490" +#define FILE_VER_NUMBER 2, 1, 5, 18490 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "1" #define FB_REV_NO "5" -#define FB_BUILD_NO "18489" +#define FB_BUILD_NO "18490" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.1" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 37c5787952..dcb2ffd4ed 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=1 RevNo=5 -BuildNum=18489 +BuildNum=18490 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds