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

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

Revision: 57245
          http://firebird.svn.sourceforge.net/firebird/?rev=57245&view=rev
Author:   firebirds
Date:     2012-10-15 03:40:58 +0000 (Mon, 15 Oct 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-10-14 17:39:47 UTC (rev 57244)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-10-15 03:40:58 UTC (rev 57245)
@@ -1,3 +1,7 @@
+ 2012-10-14 17:39  dimitr 
+   M src/dsql/gen.cpp
+Fixed the backporting bug introduced while fixing CORE-3902.
+
  2012-10-12 21:20  asfernandes 
    M src/jrd/unicode_util.cpp
 Backport fix for CORE-3946 - UNICODE collations does not work with ICU 49.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-10-14 17:39:47 UTC (rev 57244)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-10-15 03:40:58 UTC (rev 57245)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26545
+  FORMAL BUILD NUMBER:26546
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26545"
-#define FILE_VER_STRING "WI-V2.5.3.26545"
-#define LICENSE_VER_STRING "WI-V2.5.3.26545"
-#define FILE_VER_NUMBER 2, 5, 3, 26545
+#define PRODUCT_VER_STRING "2.5.3.26546"
+#define FILE_VER_STRING "WI-V2.5.3.26546"
+#define LICENSE_VER_STRING "WI-V2.5.3.26546"
+#define FILE_VER_NUMBER 2, 5, 3, 26546
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26545"
+#define FB_BUILD_NO "26546"
 #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-10-14 17:39:47 UTC (rev 57244)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-10-15 03:40:58 UTC (rev 57245)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26545
+BuildNum=26546
 
 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.