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

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

Revision: 62616
          http://sourceforge.net/p/firebird/code/62616
Author:   firebirds
Date:     2015-11-30 00:19:53 +0000 (Mon, 30 Nov 2015)
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	2015-11-30 00:11:54 UTC (rev 62615)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-11-30 00:19:53 UTC (rev 62616)
@@ -1,3 +1,7 @@
+ 2015-11-29 15:16  dimitr 
+   M src/jrd/jrd.cpp
+Fixed processing of asynchronous errors if they're thrown directly via checkCancelState().
+
  2015-11-18 21:43  dimitr 
    M src/misc/writeBuildNum.sh
 Bumped the build number.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-11-30 00:11:54 UTC (rev 62615)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-11-30 00:19:53 UTC (rev 62616)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26956
+  FORMAL BUILD NUMBER:26957
 */
 
-#define PRODUCT_VER_STRING "2.5.6.26956"
-#define FILE_VER_STRING "WI-V2.5.6.26956"
-#define LICENSE_VER_STRING "WI-V2.5.6.26956"
-#define FILE_VER_NUMBER 2, 5, 6, 26956
+#define PRODUCT_VER_STRING "2.5.6.26957"
+#define FILE_VER_STRING "WI-V2.5.6.26957"
+#define LICENSE_VER_STRING "WI-V2.5.6.26957"
+#define FILE_VER_NUMBER 2, 5, 6, 26957
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "6"
-#define FB_BUILD_NO "26956"
+#define FB_BUILD_NO "26957"
 #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	2015-11-30 00:11:54 UTC (rev 62615)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-11-30 00:19:53 UTC (rev 62616)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=6
-BuildNum=26956
+BuildNum=26957
 
 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.