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

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

Revision: 59590
          http://sourceforge.net/p/firebird/code/59590
Author:   firebirds
Date:     2014-05-15 00:35:37 +0000 (Thu, 15 May 2014)
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	2014-05-14 09:22:16 UTC (rev 59589)
+++ firebird/trunk/ChangeLog	2014-05-15 00:35:37 UTC (rev 59590)
@@ -1,3 +1,17 @@
+ 2014-05-14 09:22  dimitr 
+   M src/jrd/sort.cpp
+   M src/jrd/sort.h
+Fixed CORE-4419: Server crashes while sorting records longer than 128KB.
+
+ 2014-05-14 08:28  dimitr 
+   M src/jrd/recsrc/HashJoin.cpp
+Slightly reworked the key processing in the hash join algorithm.
+
+ 2014-05-14 08:24  dimitr 
+   M src/jrd/recsrc/MergeJoin.cpp
+   M src/jrd/recsrc/RecordSource.h
+Fixed the accidentally broken merge join algorithm.
+
  2014-05-13 01:47  asfernandes 
    M src/jrd/dfw.epp
 Fixed CORE-4425 - User-collations based on UNICODE are not upgrade to newer ICU version on restore.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-05-14 09:22:16 UTC (rev 59589)
+++ firebird/trunk/src/jrd/build_no.h	2014-05-15 00:35:37 UTC (rev 59590)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31132
+  FORMAL BUILD NUMBER:31135
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31132"
-#define FILE_VER_STRING "WI-T3.0.0.31132"
-#define LICENSE_VER_STRING "WI-T3.0.0.31132"
-#define FILE_VER_NUMBER 3, 0, 0, 31132
+#define PRODUCT_VER_STRING "3.0.0.31135"
+#define FILE_VER_STRING "WI-T3.0.0.31135"
+#define LICENSE_VER_STRING "WI-T3.0.0.31135"
+#define FILE_VER_NUMBER 3, 0, 0, 31135
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31132"
+#define FB_BUILD_NO "31135"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-05-14 09:22:16 UTC (rev 59589)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-05-15 00:35:37 UTC (rev 59590)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31132
+BuildNum=31135
 
 NowAt=`pwd`
 cd `dirname $0`

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