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

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

Revision: 62213
          http://sourceforge.net/p/firebird/code/62213
Author:   firebirds
Date:     2015-09-12 00:13:36 +0000 (Sat, 12 Sep 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-09-12 00:09:04 UTC (rev 62212)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-09-12 00:13:36 UTC (rev 62213)
@@ -1,3 +1,9 @@
+ 2015-09-11 09:18  dimitr 
+   M src/jrd/opt.cpp
+   M src/jrd/rse.cpp
+   M src/jrd/rse.h
+Fixed CORE-4909 re. sort/merge joins.
+
  2015-09-07 09:56  dimitr 
    M src/jrd/opt.cpp
 Fixed CORE-4927: IIF function prevents the condition from being pushed into the union for better optimization.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-09-12 00:09:04 UTC (rev 62212)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-09-12 00:13:36 UTC (rev 62213)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26928
+  FORMAL BUILD NUMBER:26929
 */
 
-#define PRODUCT_VER_STRING "2.5.5.26928"
-#define FILE_VER_STRING "WI-V2.5.5.26928"
-#define LICENSE_VER_STRING "WI-V2.5.5.26928"
-#define FILE_VER_NUMBER 2, 5, 5, 26928
+#define PRODUCT_VER_STRING "2.5.5.26929"
+#define FILE_VER_STRING "WI-V2.5.5.26929"
+#define LICENSE_VER_STRING "WI-V2.5.5.26929"
+#define FILE_VER_NUMBER 2, 5, 5, 26929
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "5"
-#define FB_BUILD_NO "26928"
+#define FB_BUILD_NO "26929"
 #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-09-12 00:09:04 UTC (rev 62212)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-09-12 00:13:36 UTC (rev 62213)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=5
-BuildNum=26928
+BuildNum=26929
 
 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.