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

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

Revision: 53342
          http://firebird.svn.sourceforge.net/firebird/?rev=53342&view=rev
Author:   firebirds
Date:     2011-07-22 03:24:29 +0000 (Fri, 22 Jul 2011)

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	2011-07-21 10:24:12 UTC (rev 53341)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-07-22 03:24:29 UTC (rev 53342)
@@ -1,3 +1,7 @@
+ 2011-07-21 10:19  dimitr 
+   M src/jrd/btr.cpp
+Relaxed the rules a bit thus moving some checks to runtime. This fixes the regression in CORE-1812.
+
  2011-07-20 10:35  dimitr 
    M src/jrd/cvt2.cpp
    M src/jrd/cvt2_proto.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-07-21 10:24:12 UTC (rev 53341)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-07-22 03:24:29 UTC (rev 53342)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26341
+  FORMAL BUILD NUMBER:26342
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26341"
-#define FILE_VER_STRING "WI-V2.5.1.26341"
-#define LICENSE_VER_STRING "WI-V2.5.1.26341"
-#define FILE_VER_NUMBER 2, 5, 1, 26341
+#define PRODUCT_VER_STRING "2.5.1.26342"
+#define FILE_VER_STRING "WI-V2.5.1.26342"
+#define LICENSE_VER_STRING "WI-V2.5.1.26342"
+#define FILE_VER_NUMBER 2, 5, 1, 26342
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26341"
+#define FB_BUILD_NO "26342"
 #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	2011-07-21 10:24:12 UTC (rev 53341)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-07-22 03:24:29 UTC (rev 53342)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26341
+BuildNum=26342
 
 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.