[Firebird-checkins] SF.net SVN: firebird:[63055] firebird/trunk

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

Revision: 63055
          http://sourceforge.net/p/firebird/code/63055
Author:   firebirds
Date:     2016-03-01 00:09:46 +0000 (Tue, 01 Mar 2016)
Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2016-02-29 21:40:00 UTC (rev 63054)
+++ firebird/trunk/ChangeLog	2016-03-01 00:09:46 UTC (rev 63055)
@@ -1,3 +1,7 @@
+ 2016-02-29 20:01  dimitr 
+   M src/dsql/ExprNodes.cpp
+Fixed CORE-5122: Expression index may not be used by the optimizer if created and used in different connection charsets.
+
  2016-02-28 09:14  dimitr 
    M src/dsql/StmtNodes.cpp
    M src/dsql/StmtNodes.h

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2016-02-29 21:40:00 UTC (rev 63054)
+++ firebird/trunk/src/jrd/build_no.h	2016-03-01 00:09:46 UTC (rev 63055)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:32370
+  FORMAL BUILD NUMBER:32371
 */
 
-#define PRODUCT_VER_STRING "4.0.0.32370"
-#define FILE_VER_STRING "WI-T4.0.0.32370"
-#define LICENSE_VER_STRING "WI-T4.0.0.32370"
-#define FILE_VER_NUMBER 4, 0, 0, 32370
+#define PRODUCT_VER_STRING "4.0.0.32371"
+#define FILE_VER_STRING "WI-T4.0.0.32371"
+#define LICENSE_VER_STRING "WI-T4.0.0.32371"
+#define FILE_VER_NUMBER 4, 0, 0, 32371
 #define FB_MAJOR_VER "4"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32370"
+#define FB_BUILD_NO "32371"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 4.0 Unstable"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2016-02-29 21:40:00 UTC (rev 63054)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2016-03-01 00:09:46 UTC (rev 63055)
@@ -9,7 +9,7 @@
 MajorVer=4
 MinorVer=0
 RevNo=0
-BuildNum=32370
+BuildNum=32371
 
 NowAt=`pwd`
 cd `dirname $0`

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.