From a101417f12866c6b6d7c9965de44790c4ec9506d Mon Sep 17 00:00:00 2001 From: firebirds Date: Tue, 8 Apr 2014 00:47:01 +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 947c8a8917..19a1e27611 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2014-04-05 18:08 dimitr + M src/jrd/dfw.epp +Simplest solution for CORE-4386: Report more details for "object in use" errors. Also, I've removed the database filename from the error message for security reasons. v3 is going to get a more complete solution. + 2014-04-04 08:52 hvlad M src/jrd/exe.cpp Wrong code was committed (for CORE-4252), sorry diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index 4e0697c510..6ae1e44b30 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:26752 + FORMAL BUILD NUMBER:26753 */ -#define PRODUCT_VER_STRING "2.5.3.26752" -#define FILE_VER_STRING "WI-V2.5.3.26752" -#define LICENSE_VER_STRING "WI-V2.5.3.26752" -#define FILE_VER_NUMBER 2, 5, 3, 26752 +#define PRODUCT_VER_STRING "2.5.3.26753" +#define FILE_VER_STRING "WI-V2.5.3.26753" +#define LICENSE_VER_STRING "WI-V2.5.3.26753" +#define FILE_VER_NUMBER 2, 5, 3, 26753 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "3" -#define FB_BUILD_NO "26752" +#define FB_BUILD_NO "26753" #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 728a0fc86c..a210254c64 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=3 -BuildNum=26752 +BuildNum=26753 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds