[Firebird-checkins] SF.net SVN: firebird:[62948] firebird/branches/B2_5_Release

[<fir...@us...>]

Revision: 62948
          http://sourceforge.net/p/firebird/code/62948
Author:   firebirds
Date:     2016-02-08 00:13:25 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/branches/B2_5_Release/ChangeLog
    firebird/branches/B2_5_Release/src/jrd/build_no.h
    firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh

Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog	2016-02-08 00:08:48 UTC (rev 62947)
+++ firebird/branches/B2_5_Release/ChangeLog	2016-02-08 00:13:25 UTC (rev 62948)
@@ -1,3 +1,7 @@
+ 2016-02-07 11:48  dimitr 
+   M src/jrd/jrd.cpp
+Backported from trunk: unwind the cache if checkCancelState(true) is called directly.
+
  2016-02-04 17:14  hvlad 
    M src/jrd/extds/InternalDS.cpp
 Additional fix for bug CORE-5087 : Database shutdown can cause server crash if multiple attachments run EXECUTE STATEMENT

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2016-02-08 00:08:48 UTC (rev 62947)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2016-02-08 00:13:25 UTC (rev 62948)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26970
+  FORMAL BUILD NUMBER:26971
 */
 
-#define PRODUCT_VER_STRING "2.5.6.26970"
-#define FILE_VER_STRING "WI-V2.5.6.26970"
-#define LICENSE_VER_STRING "WI-V2.5.6.26970"
-#define FILE_VER_NUMBER 2, 5, 6, 26970
+#define PRODUCT_VER_STRING "2.5.6.26971"
+#define FILE_VER_STRING "WI-V2.5.6.26971"
+#define LICENSE_VER_STRING "WI-V2.5.6.26971"
+#define FILE_VER_NUMBER 2, 5, 6, 26971
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "6"
-#define FB_BUILD_NO "26970"
+#define FB_BUILD_NO "26971"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"

Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2016-02-08 00:08:48 UTC (rev 62947)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2016-02-08 00:13:25 UTC (rev 62948)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=6
-BuildNum=26970
+BuildNum=26971
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.