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

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

Revision: 59726
          http://sourceforge.net/p/firebird/code/59726
Author:   firebirds
Date:     2014-06-18 00:57:56 +0000 (Wed, 18 Jun 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-06-18 00:43:02 UTC (rev 59725)
+++ firebird/branches/B2_5_Release/ChangeLog	2014-06-18 00:57:56 UTC (rev 59726)
@@ -1,3 +1,7 @@
+ 2014-06-17 15:45  asfernandes 
+   M src/jrd/dyn_def.epp
+Fixed CORE-4452 - Can`t create two collations with different names if autoddl =OFF.
+
  2014-06-16 13:50  alexpeshkoff 
    M src/utilities/nbackup.cpp
 Backported fix for CORE-4461: nbackup prints error messages to stdout instead stderr

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-06-18 00:43:02 UTC (rev 59725)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-06-18 00:57:56 UTC (rev 59726)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26779
+  FORMAL BUILD NUMBER:26780
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26779"
-#define FILE_VER_STRING "WI-V2.5.3.26779"
-#define LICENSE_VER_STRING "WI-V2.5.3.26779"
-#define FILE_VER_NUMBER 2, 5, 3, 26779
+#define PRODUCT_VER_STRING "2.5.3.26780"
+#define FILE_VER_STRING "WI-V2.5.3.26780"
+#define LICENSE_VER_STRING "WI-V2.5.3.26780"
+#define FILE_VER_NUMBER 2, 5, 3, 26780
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26779"
+#define FB_BUILD_NO "26780"
 #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-06-18 00:43:02 UTC (rev 59725)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2014-06-18 00:57:56 UTC (rev 59726)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26779
+BuildNum=26780
 
 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.