diff --git a/ChangeLog b/ChangeLog index 7dc7c32925..c7fd05ce7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2013-01-30 11:23 dimitr + M src/jrd/Database.h +Fixed the recently introduced deadlock. This is the simplest possible patch, other solutions are possible. + 2013-01-25 12:37 dimitr M src/jrd/extds/ExtDS.cpp M src/jrd/extds/ExtDS.h diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index c3bb45479f..b2b9f6caf6 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:26611 + FORMAL BUILD NUMBER:26612 */ -#define PRODUCT_VER_STRING "2.5.3.26611" -#define FILE_VER_STRING "WI-V2.5.3.26611" -#define LICENSE_VER_STRING "WI-V2.5.3.26611" -#define FILE_VER_NUMBER 2, 5, 3, 26611 +#define PRODUCT_VER_STRING "2.5.3.26612" +#define FILE_VER_STRING "WI-V2.5.3.26612" +#define LICENSE_VER_STRING "WI-V2.5.3.26612" +#define FILE_VER_NUMBER 2, 5, 3, 26612 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "3" -#define FB_BUILD_NO "26611" +#define FB_BUILD_NO "26612" #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 9a28d93d21..5f438beb13 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=3 -BuildNum=26611 +BuildNum=26612 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds