diff --git a/doc/WhatsNew b/doc/WhatsNew index 81dbaef276..4531d8ac83 100644 --- a/doc/WhatsNew +++ b/doc/WhatsNew @@ -2,6 +2,11 @@ * v2.1.4 *************************** + * Bugfix CORE-2648 + NBackup's delta file ignores the "Forced Writes" database setting + Contributor(s): + Vlad Khorsun + * Bugfix CORE-2640 A regular deadlock may not be detected by the lock manager under some conditions, thus resulting in a hang @@ -54,6 +59,11 @@ Contributor(s): Vlad Khorsun + * Bugfix CORE-2084 + Services API security problem + Contributor(s): + Alex Peshkov + * Bugfix CORE-1346 LPAD and RPAD with two columns not working Contributor(s): diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index 8678d27593..ab830b17dd 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:18220 + FORMAL BUILD NUMBER:18222 */ -#define PRODUCT_VER_STRING "2.1.4.18220" -#define FILE_VER_STRING "WI-V2.1.4.18220" -#define LICENSE_VER_STRING "WI-V2.1.4.18220" -#define FILE_VER_NUMBER 2, 1, 4, 18220 +#define PRODUCT_VER_STRING "2.1.4.18222" +#define FILE_VER_STRING "WI-V2.1.4.18222" +#define LICENSE_VER_STRING "WI-V2.1.4.18222" +#define FILE_VER_NUMBER 2, 1, 4, 18222 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "1" #define FB_REV_NO "4" -#define FB_BUILD_NO "18220" +#define FB_BUILD_NO "18222" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.1" diff --git a/src/jrd/isc_version.h b/src/jrd/isc_version.h index e7a03adee5..c476ba15e1 100644 --- a/src/jrd/isc_version.h +++ b/src/jrd/isc_version.h @@ -17,7 +17,7 @@ * Contributor(s): ______________________________________. */ -#define ISC_FILE_VER_STRING "WI-V6.3.4.18220" -#define ISC_FILE_VER_NUMBER 6, 3, 4, 18220 +#define ISC_FILE_VER_STRING "WI-V6.3.4.18222" +#define ISC_FILE_VER_NUMBER 6, 3, 4, 18222 #define ISC_MAJOR_VER "6" #define ISC_MINOR_VER "3" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 4c1bde5f33..67a0ddc76f 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -3,13 +3,13 @@ # This file is used both to rebuild the header file and to set the # environment variables on the config call -BuildVersion="$Id: writeBuildNum.sh,v 1.17894.2.26 2009-09-29 06:54:46 dimitr Exp $" +BuildVersion="$Id: writeBuildNum.sh,v 1.17894.2.27 2009-10-05 07:45:21 dimitr Exp $" BuildType=V MajorVer=2 MinorVer=1 RevNo=4 -BuildNum=18220 +BuildNum=18222 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds