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

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

Revision: 60679
          http://sourceforge.net/p/firebird/code/60679
Author:   firebirds
Date:     2015-02-13 00:21:59 +0000 (Fri, 13 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-13 00:14:18 UTC (rev 60678)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-02-13 00:21:59 UTC (rev 60679)
@@ -1,3 +1,10 @@
+ 2015-02-12 19:56  dimitr 
+   M src/jrd/Optimizer.cpp
+   M src/jrd/cmp.cpp
+   M src/jrd/evl.cpp
+   M src/jrd/exe.h
+Backported improved ANY/ALL handling from trunk. This should fix CORE-4690: DISTINCT vs non-DISTINCT affects the result of IN subquery.
+
  2015-02-04 14:52  smirnoffjr 
    M src/jrd/isc_file.cpp
 Backported from trunk: small fix for generic UNIX Mnt::get() implementation

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-02-13 00:14:18 UTC (rev 60678)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-02-13 00:21:59 UTC (rev 60679)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26835
+  FORMAL BUILD NUMBER:26836
 */
 
-#define PRODUCT_VER_STRING "2.5.4.26835"
-#define FILE_VER_STRING "WI-V2.5.4.26835"
-#define LICENSE_VER_STRING "WI-V2.5.4.26835"
-#define FILE_VER_NUMBER 2, 5, 4, 26835
+#define PRODUCT_VER_STRING "2.5.4.26836"
+#define FILE_VER_STRING "WI-V2.5.4.26836"
+#define LICENSE_VER_STRING "WI-V2.5.4.26836"
+#define FILE_VER_NUMBER 2, 5, 4, 26836
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "26835"
+#define FB_BUILD_NO "26836"
 #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-13 00:14:18 UTC (rev 60678)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-02-13 00:21:59 UTC (rev 60679)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=4
-BuildNum=26835
+BuildNum=26836
 
 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.