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

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

Revision: 63056
          http://sourceforge.net/p/firebird/code/63056
Author:   firebirds
Date:     2016-03-01 00:22:41 +0000 (Tue, 01 Mar 2016)
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	2016-03-01 00:09:46 UTC (rev 63055)
+++ firebird/branches/B2_5_Release/ChangeLog	2016-03-01 00:22:41 UTC (rev 63056)
@@ -1,3 +1,11 @@
+ 2016-02-29 19:41  dimitr 
+   M src/jrd/Optimizer.cpp
+Misc (simplified the code).
+
+ 2016-02-29 19:19  dimitr 
+   M src/jrd/Optimizer.cpp
+Fixed CORE-5122: Expression index may not be used by the optimizer if created and used in different connection charsets.
+
  2016-02-28 15:51  hvlad 
    M src/jrd/jrd.cpp
    M src/jrd/trace/TraceConfigStorage.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2016-03-01 00:09:46 UTC (rev 63055)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2016-03-01 00:22:41 UTC (rev 63056)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26977
+  FORMAL BUILD NUMBER:26979
 */
 
-#define PRODUCT_VER_STRING "2.5.6.26977"
-#define FILE_VER_STRING "WI-V2.5.6.26977"
-#define LICENSE_VER_STRING "WI-V2.5.6.26977"
-#define FILE_VER_NUMBER 2, 5, 6, 26977
+#define PRODUCT_VER_STRING "2.5.6.26979"
+#define FILE_VER_STRING "WI-V2.5.6.26979"
+#define LICENSE_VER_STRING "WI-V2.5.6.26979"
+#define FILE_VER_NUMBER 2, 5, 6, 26979
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "6"
-#define FB_BUILD_NO "26977"
+#define FB_BUILD_NO "26979"
 #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	2016-03-01 00:09:46 UTC (rev 63055)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2016-03-01 00:22:41 UTC (rev 63056)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=6
-BuildNum=26977
+BuildNum=26979
 
 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.