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

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

Revision: 60727
          http://sourceforge.net/p/firebird/code/60727
Author:   firebirds
Date:     2015-02-19 00:23:11 +0000 (Thu, 19 Feb 2015)
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	2015-02-19 00:16:15 UTC (rev 60726)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-02-19 00:23:11 UTC (rev 60727)
@@ -1,3 +1,11 @@
+ 2015-02-18 12:53  dimitr 
+   M src/common/cvt.cpp
+Misc.
+
+ 2015-02-18 12:53  dimitr 
+   M src/jrd/evl.cpp
+Fixed DBKEY retrieval after implicit CHAR<->VARCHAR conversions.
+
  2015-02-14 08:11  dimitr 
    M src/jrd/tra.cpp
 Forgotten change for CORE-4383.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-02-19 00:16:15 UTC (rev 60726)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-02-19 00:23:11 UTC (rev 60727)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26838
+  FORMAL BUILD NUMBER:26840
 */
 
-#define PRODUCT_VER_STRING "2.5.4.26838"
-#define FILE_VER_STRING "WI-V2.5.4.26838"
-#define LICENSE_VER_STRING "WI-V2.5.4.26838"
-#define FILE_VER_NUMBER 2, 5, 4, 26838
+#define PRODUCT_VER_STRING "2.5.4.26840"
+#define FILE_VER_STRING "WI-V2.5.4.26840"
+#define LICENSE_VER_STRING "WI-V2.5.4.26840"
+#define FILE_VER_NUMBER 2, 5, 4, 26840
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "26838"
+#define FB_BUILD_NO "26840"
 #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	2015-02-19 00:16:15 UTC (rev 60726)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-02-19 00:23:11 UTC (rev 60727)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=4
-BuildNum=26838
+BuildNum=26840
 
 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.