diff --git a/ChangeLog b/ChangeLog index 8ce695b080..ebbe9a3675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ + 2012-04-27 16:31 dimitr + M src/dsql/pass1.cpp +Fixed CORE-3834: Usage of a NATURAL JOIN with a derived table crashes the server. + + 2012-04-27 13:21 alexpeshkoff + M src/remote/inet.cpp +Fixed posix build + 2012-04-26 09:39 paulbeach M builds/install/misc/firebird.conf.in Make the conf. parameter DummyPacketInterval more accurate. diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index dbd8975b06..46ec745a1f 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:26470 + FORMAL BUILD NUMBER:26472 */ -#define PRODUCT_VER_STRING "2.5.2.26470" -#define FILE_VER_STRING "WI-V2.5.2.26470" -#define LICENSE_VER_STRING "WI-V2.5.2.26470" -#define FILE_VER_NUMBER 2, 5, 2, 26470 +#define PRODUCT_VER_STRING "2.5.2.26472" +#define FILE_VER_STRING "WI-V2.5.2.26472" +#define LICENSE_VER_STRING "WI-V2.5.2.26472" +#define FILE_VER_NUMBER 2, 5, 2, 26472 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "2" -#define FB_BUILD_NO "26470" +#define FB_BUILD_NO "26472" #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 330eff6777..42a58d3baf 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=2 -BuildNum=26470 +BuildNum=26472 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds