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

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

Revision: 62212
          http://sourceforge.net/p/firebird/code/62212
Author:   firebirds
Date:     2015-09-12 00:09:04 +0000 (Sat, 12 Sep 2015)
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	2015-09-11 09:57:10 UTC (rev 62211)
+++ firebird/trunk/ChangeLog	2015-09-12 00:09:04 UTC (rev 62212)
@@ -1,3 +1,10 @@
+ 2015-09-11 09:57  dimitr 
+   M src/jrd/opt.cpp
+   M src/jrd/recsrc/MergeJoin.cpp
+   M src/jrd/recsrc/RecordSource.h
+   M src/jrd/recsrc/SortedStream.cpp
+Fixed CORE-4909 re. sort/merge joins.
+
  2015-09-10 17:06  asfernandes 
    M src/dsql/StmtNodes.cpp
    M src/jrd/exe.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-09-11 09:57:10 UTC (rev 62211)
+++ firebird/trunk/src/jrd/build_no.h	2015-09-12 00:09:04 UTC (rev 62212)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:32032
+  FORMAL BUILD NUMBER:32033
 */
 
-#define PRODUCT_VER_STRING "3.0.0.32032"
-#define FILE_VER_STRING "WI-V3.0.0.32032"
-#define LICENSE_VER_STRING "WI-V3.0.0.32032"
-#define FILE_VER_NUMBER 3, 0, 0, 32032
+#define PRODUCT_VER_STRING "3.0.0.32033"
+#define FILE_VER_STRING "WI-V3.0.0.32033"
+#define LICENSE_VER_STRING "WI-V3.0.0.32033"
+#define FILE_VER_NUMBER 3, 0, 0, 32033
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32032"
+#define FB_BUILD_NO "32033"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-09-11 09:57:10 UTC (rev 62211)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-09-12 00:09:04 UTC (rev 62212)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=32032
+BuildNum=32033
 
 NowAt=`pwd`
 cd `dirname $0`

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