From 890231db4b1077b259e2dd0452985b696cf7e1b2 Mon Sep 17 00:00:00 2001 From: firebirds Date: Tue, 1 Nov 2011 03:28:33 +0000 Subject: [PATCH] nightly update --- ChangeLog | 6 ++++++ src/jrd/build_no.h | 12 ++++++------ src/misc/writeBuildNum.sh | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c17ce95b7c..5478109499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + 2011-10-31 18:35 alexpeshkoff + M src/common/fb_exception.cpp + M src/common/thd.cpp + M src/common/thd.h +Fixed CORE-3646: Segmentation fault in multi-threaded program when using 2.5.x client library on Linux + 2011-10-16 14:11 hvlad M src/jrd/trace/TraceConfigStorage.cpp One more assertion diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index 8f297d5df9..a1ce3b1165 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:26386 + FORMAL BUILD NUMBER:26387 */ -#define PRODUCT_VER_STRING "2.5.2.26386" -#define FILE_VER_STRING "WI-V2.5.2.26386" -#define LICENSE_VER_STRING "WI-V2.5.2.26386" -#define FILE_VER_NUMBER 2, 5, 2, 26386 +#define PRODUCT_VER_STRING "2.5.2.26387" +#define FILE_VER_STRING "WI-V2.5.2.26387" +#define LICENSE_VER_STRING "WI-V2.5.2.26387" +#define FILE_VER_NUMBER 2, 5, 2, 26387 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "2" -#define FB_BUILD_NO "26386" +#define FB_BUILD_NO "26387" #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 42c722138e..605b7d6a01 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=2 -BuildNum=26386 +BuildNum=26387 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds