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

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

Revision: 61678
          http://sourceforge.net/p/firebird/code/61678
Author:   firebirds
Date:     2015-06-01 00:15:07 +0000 (Mon, 01 Jun 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-06-01 00:10:45 UTC (rev 61677)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-06-01 00:15:07 UTC (rev 61678)
@@ -1,3 +1,21 @@
+ 2015-05-31 16:26  dimitr 
+   M src/jrd/evl.cpp
+   M src/jrd/exe.h
+   M src/jrd/opt.cpp
+Fixed CORE-214: Count ( DISTINCT ... ) is too slow.
+
+ 2015-05-31 13:10  dimitr 
+   M src/jrd/btr.cpp
+Postfix for CORE-4786: Problematic key value (when attempt to insert duplicate in PK/UK) is not shown where length of key >= 127 characters.
+
+ 2015-05-31 13:05  dimitr 
+   M src/jrd/dsc.h
+Fixed CORE-4809: HASH/MERGE JOIN is not used for more than two streams if they are joined via USING/NATURAL clauses and join is based on DBKEY concatenations.
+
+ 2015-05-31 13:00  dimitr 
+   M src/jrd/opt.cpp
+Fixed CORE-4822: MERGE JOIN cannot be used for DBKEY based expressions.
+
  2015-05-27 17:15  mapopa 
    M builds/posix/prefix.darwin_i386
    M builds/posix/prefix.darwin_x86_64

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-06-01 00:10:45 UTC (rev 61677)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-06-01 00:15:07 UTC (rev 61678)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26874
+  FORMAL BUILD NUMBER:26878
 */
 
-#define PRODUCT_VER_STRING "2.5.5.26874"
-#define FILE_VER_STRING "WI-V2.5.5.26874"
-#define LICENSE_VER_STRING "WI-V2.5.5.26874"
-#define FILE_VER_NUMBER 2, 5, 5, 26874
+#define PRODUCT_VER_STRING "2.5.5.26878"
+#define FILE_VER_STRING "WI-V2.5.5.26878"
+#define LICENSE_VER_STRING "WI-V2.5.5.26878"
+#define FILE_VER_NUMBER 2, 5, 5, 26878
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "5"
-#define FB_BUILD_NO "26874"
+#define FB_BUILD_NO "26878"
 #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-06-01 00:10:45 UTC (rev 61677)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-06-01 00:15:07 UTC (rev 61678)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=5
-BuildNum=26874
+BuildNum=26878
 
 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.