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

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

Revision: 59317
          http://sourceforge.net/p/firebird/code/59317
Author:   firebirds
Date:     2014-03-26 01:22:49 +0000 (Wed, 26 Mar 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-03-26 00:49:49 UTC (rev 59316)
+++ firebird/branches/B2_5_Release/ChangeLog	2014-03-26 01:22:49 UTC (rev 59317)
@@ -1,3 +1,11 @@
+ 2014-03-25 13:32  hvlad 
+   M src/jrd/cch.cpp
+Fixed bug CORE-2848 : "lock conversion denied" or "lock denied" error
+
+ 2014-03-25 10:12  hvlad 
+   M src/jrd/dpm.epp
+Fixed bug CORE-4372 : Deadlock is possible when two data pages contains record fragments pointing to each other
+
  2014-03-13 09:29  roman-simakov 
    M src/jrd/jrd.h
    M src/jrd/validation.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-03-26 00:49:49 UTC (rev 59316)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-03-26 01:22:49 UTC (rev 59317)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26748
+  FORMAL BUILD NUMBER:26750
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26748"
-#define FILE_VER_STRING "WI-V2.5.3.26748"
-#define LICENSE_VER_STRING "WI-V2.5.3.26748"
-#define FILE_VER_NUMBER 2, 5, 3, 26748
+#define PRODUCT_VER_STRING "2.5.3.26750"
+#define FILE_VER_STRING "WI-V2.5.3.26750"
+#define LICENSE_VER_STRING "WI-V2.5.3.26750"
+#define FILE_VER_NUMBER 2, 5, 3, 26750
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26748"
+#define FB_BUILD_NO "26750"
 #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-03-26 00:49:49 UTC (rev 59316)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2014-03-26 01:22:49 UTC (rev 59317)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26748
+BuildNum=26750
 
 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.