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

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

Revision: 59180
          http://sourceforge.net/p/firebird/code/59180
Author:   firebirds
Date:     2014-02-24 00:58:46 +0000 (Mon, 24 Feb 2014)
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	2014-02-24 00:43:04 UTC (rev 59179)
+++ firebird/branches/B2_5_Release/ChangeLog	2014-02-24 00:58:46 UTC (rev 59180)
@@ -1,3 +1,7 @@
+ 2014-02-23 07:10  dimitr 
+   M src/jrd/vio.cpp
+Backported detailed error reporting for conflicts during reading in NORECVER transactions.
+
  2014-02-22 22:22  robocop 
    M src/jrd/sdl.cpp
 Warning (PVS-Studio).

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-02-24 00:43:04 UTC (rev 59179)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-02-24 00:58:46 UTC (rev 59180)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26744
+  FORMAL BUILD NUMBER:26745
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26744"
-#define FILE_VER_STRING "WI-V2.5.3.26744"
-#define LICENSE_VER_STRING "WI-V2.5.3.26744"
-#define FILE_VER_NUMBER 2, 5, 3, 26744
+#define PRODUCT_VER_STRING "2.5.3.26745"
+#define FILE_VER_STRING "WI-V2.5.3.26745"
+#define LICENSE_VER_STRING "WI-V2.5.3.26745"
+#define FILE_VER_NUMBER 2, 5, 3, 26745
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26744"
+#define FB_BUILD_NO "26745"
 #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	2014-02-24 00:43:04 UTC (rev 59179)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2014-02-24 00:58:46 UTC (rev 59180)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26744
+BuildNum=26745
 
 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.