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

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

Revision: 58124
          http://sourceforge.net/p/firebird/code/58124
Author:   firebirds
Date:     2013-06-01 00:46:58 +0000 (Sat, 01 Jun 2013)
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	2013-05-31 18:05:22 UTC (rev 58123)
+++ firebird/branches/B2_5_Release/ChangeLog	2013-06-01 00:46:58 UTC (rev 58124)
@@ -1,3 +1,7 @@
+ 2013-05-29 12:13  dimitr 
+   M src/dsql/pass1.cpp
+Fixed CORE-4107: Wrong resultset (subquery + derived table + union).
+
  2013-05-23 11:55  alexpeshkoff 
    M src/common/classes/PublicHandle.h
    M src/jrd/jrd.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-05-31 18:05:22 UTC (rev 58123)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-06-01 00:46:58 UTC (rev 58124)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26649
+  FORMAL BUILD NUMBER:26650
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26649"
-#define FILE_VER_STRING "WI-V2.5.3.26649"
-#define LICENSE_VER_STRING "WI-V2.5.3.26649"
-#define FILE_VER_NUMBER 2, 5, 3, 26649
+#define PRODUCT_VER_STRING "2.5.3.26650"
+#define FILE_VER_STRING "WI-V2.5.3.26650"
+#define LICENSE_VER_STRING "WI-V2.5.3.26650"
+#define FILE_VER_NUMBER 2, 5, 3, 26650
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26649"
+#define FB_BUILD_NO "26650"
 #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	2013-05-31 18:05:22 UTC (rev 58123)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2013-06-01 00:46:58 UTC (rev 58124)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26649
+BuildNum=26650
 
 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.