From a1090abb6d0f1716ef8f4c1332ee52bdc8e0b18d Mon Sep 17 00:00:00 2001 From: firebirds Date: Tue, 12 Mar 2013 03:06:14 +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 ae4c1c10c0..4d64d97619 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + 2013-03-11 15:44 alexpeshkoff + M src/common/classes/auto.h + M src/jrd/cmp.cpp + M src/jrd/exe.h +Bacported fix for CORE-3360: update ... returning ... raises -551 (no perm to update) for a column present only in the returning clause + 2013-03-06 11:33 alexpeshkoff M src/remote/inet.cpp Fixed CORE-4058 diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index bc4d9ae601..38b8587389 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:18514 + FORMAL BUILD NUMBER:18515 */ -#define PRODUCT_VER_STRING "2.1.6.18514" -#define FILE_VER_STRING "WI-V2.1.6.18514" -#define LICENSE_VER_STRING "WI-V2.1.6.18514" -#define FILE_VER_NUMBER 2, 1, 6, 18514 +#define PRODUCT_VER_STRING "2.1.6.18515" +#define FILE_VER_STRING "WI-V2.1.6.18515" +#define LICENSE_VER_STRING "WI-V2.1.6.18515" +#define FILE_VER_NUMBER 2, 1, 6, 18515 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "1" #define FB_REV_NO "6" -#define FB_BUILD_NO "18514" +#define FB_BUILD_NO "18515" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.1" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 6abf08245f..3616d35da6 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=1 RevNo=6 -BuildNum=18514 +BuildNum=18515 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds