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

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

Revision: 52940
          http://firebird.svn.sourceforge.net/firebird/?rev=52940&view=rev
Author:   firebirds
Date:     2011-05-14 03:18:18 +0000 (Sat, 14 May 2011)

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	2011-05-14 02:49:02 UTC (rev 52939)
+++ firebird/trunk/ChangeLog	2011-05-14 03:18:18 UTC (rev 52940)
@@ -1,3 +1,15 @@
+ 2011-05-14 02:49  asfernandes 
+   M src/dsql/pass1.cpp
+Fixed crash with nested unions, reported by Vlad.
+SELECT 'a' FROM RDB$DATABASE
+UNION ALL
+SELECT X FROM
+ (
+   SELECT 'b' AS X FROM RDB$DATABASE
+   UNION ALL
+   SELECT 'c' FROM RDB$DATABASE
+ ) AS T;
+
  2011-05-13 01:23  asfernandes 
    M src/common/classes/fb_atomic.h
 Correction.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2011-05-14 02:49:02 UTC (rev 52939)
+++ firebird/trunk/src/jrd/build_no.h	2011-05-14 03:18:18 UTC (rev 52940)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:29360
+  FORMAL BUILD NUMBER:29361
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29360"
-#define FILE_VER_STRING "WI-T3.0.0.29360"
-#define LICENSE_VER_STRING "WI-T3.0.0.29360"
-#define FILE_VER_NUMBER 3, 0, 0, 29360
+#define PRODUCT_VER_STRING "3.0.0.29361"
+#define FILE_VER_STRING "WI-T3.0.0.29361"
+#define LICENSE_VER_STRING "WI-T3.0.0.29361"
+#define FILE_VER_NUMBER 3, 0, 0, 29361
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29360"
+#define FB_BUILD_NO "29361"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2011-05-14 02:49:02 UTC (rev 52939)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2011-05-14 03:18:18 UTC (rev 52940)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29360
+BuildNum=29361
 
 NowAt=`pwd`
 cd `dirname $0`


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