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

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

Revision: 54658
          http://firebird.svn.sourceforge.net/firebird/?rev=54658&view=rev
Author:   firebirds
Date:     2012-06-22 04:39:21 +0000 (Fri, 22 Jun 2012)
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	2012-06-22 04:27:21 UTC (rev 54657)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-22 04:39:21 UTC (rev 54658)
@@ -1,3 +1,12 @@
+ 2012-06-21 12:16  dimitr 
+   M src/jrd/cch.cpp
+   M src/jrd/nbak.h
+Fixed the second part of CORE-3873: Server crashes while switching to the shadow if the disk I/O fault happens while flushing the cache.
+
+ 2012-06-21 11:17  dimitr 
+   M src/jrd/sdw.cpp
+The first part of the fix for CORE-3873: Server crashes while switching to the shadow if the disk I/O fault happens while flushing the cache.
+
  2012-06-20 18:57  hvlad 
    M src/jrd/cch.cpp
 Backported fix from v3 : backup state lock should be released at latch timeout, else lock state accounting becomes inconsistent.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-22 04:27:21 UTC (rev 54657)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-22 04:39:21 UTC (rev 54658)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26499
+  FORMAL BUILD NUMBER:26501
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26499"
-#define FILE_VER_STRING "WI-V2.5.2.26499"
-#define LICENSE_VER_STRING "WI-V2.5.2.26499"
-#define FILE_VER_NUMBER 2, 5, 2, 26499
+#define PRODUCT_VER_STRING "2.5.2.26501"
+#define FILE_VER_STRING "WI-V2.5.2.26501"
+#define LICENSE_VER_STRING "WI-V2.5.2.26501"
+#define FILE_VER_NUMBER 2, 5, 2, 26501
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26499"
+#define FB_BUILD_NO "26501"
 #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	2012-06-22 04:27:21 UTC (rev 54657)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-22 04:39:21 UTC (rev 54658)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26499
+BuildNum=26501
 
 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.