diff --git a/ChangeLog b/ChangeLog index 103c34a6a8..ccdf6cea98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2012-01-23 18:17 dimitr + M src/remote/protocol.cpp +Backported CORE-3730: isc_dsql_exec_immed2() loses input parameter value with RETURNING clause. + 2012-01-19 15:34 alexpeshkoff M src/jrd/opt.cpp Backported fix for CORE-3736: WITH LOCK clause is allowed for users with read-only rights on some table, thus blocking others from updating this table diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index 430276dcb1..9bd786303c 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:18461 + FORMAL BUILD NUMBER:18462 */ -#define PRODUCT_VER_STRING "2.1.5.18461" -#define FILE_VER_STRING "WI-V2.1.5.18461" -#define LICENSE_VER_STRING "WI-V2.1.5.18461" -#define FILE_VER_NUMBER 2, 1, 5, 18461 +#define PRODUCT_VER_STRING "2.1.5.18462" +#define FILE_VER_STRING "WI-V2.1.5.18462" +#define LICENSE_VER_STRING "WI-V2.1.5.18462" +#define FILE_VER_NUMBER 2, 1, 5, 18462 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "1" #define FB_REV_NO "5" -#define FB_BUILD_NO "18461" +#define FB_BUILD_NO "18462" #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 ab99386887..8f3db3ee3e 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=1 RevNo=5 -BuildNum=18461 +BuildNum=18462 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds