--no commit message

--no commit message

h2/src/main/org/h2/command/Parser.java

@@ -839,7 +839,7 @@ public class Parser {
                 int paramIndex = parameters.size();
                 Query query = parseSelectUnion();
                 read(")");
-                query = parseSelectUnionExtension(query, start);
+                query = parseSelectUnionExtension(query, start, true);
                 ObjectArray params = new ObjectArray();
                 for (int i = paramIndex; i < parameters.size(); i++) {
                     params.add(parameters.get(i));
@@ -1248,10 +1248,10 @@ public class Parser {
     private Query parseSelectUnion() throws SQLException {
         int start = lastParseIndex;
         Query command = parseSelectSub();
-        return parseSelectUnionExtension(command, start);
+        return parseSelectUnionExtension(command, start, false);
     }
 
-    private Query parseSelectUnionExtension(Query command, int start) throws SQLException {
+    private Query parseSelectUnionExtension(Query command, int start, boolean unionOnly) throws SQLException {
         while (true) {
             if (readIf("UNION")) {
                 SelectUnion union = new SelectUnion(session, command);
@@ -1277,7 +1277,7 @@ public class Parser {
                 break;
             }
         }
-        if (readIf("ORDER")) {
+        if (!unionOnly && readIf("ORDER")) {
             read("BY");
             Select oldSelect = currentSelect;
             if (command instanceof Select) {
@@ -1317,7 +1317,7 @@ public class Parser {
             command.setOrder(orderList);
             currentSelect = oldSelect;
         }
-        if (readIf("LIMIT")) {
+        if (!unionOnly && readIf("LIMIT")) {
             Select temp = currentSelect;
             // make sure aggregate functions will not work here
             currentSelect = null;
@@ -1338,7 +1338,7 @@ public class Parser {
             }
             currentSelect = temp;
         }
-        if (readIf("FOR")) {
+        if (!unionOnly && readIf("FOR")) {
             if (readIf("UPDATE")) {
                 if (readIf("OF")) {
                     do {

h2/src/test/org/h2/test/TestAll.java

@@ -155,10 +155,7 @@ java org.h2.test.TestAll timer
 
 /*
 
-Test space re-use
-REUSE_SPACE_AFTER=20 or so
-
-delete old ipowerb content (first filter, then remove)
+delete old ipowerb content
 link to new changelog and roadmap, remove pages from google groups
 
 Can sometimes not delete log file? need test case

h2/src/test/org/h2/test/test.in.txt

 --- special grammar and test cases ---------------------------------------------------------------------------------------------
+create table test as select * from table(id int=(1, 2, 3));
+> ok
+
+SELECT * FROM (SELECT * FROM TEST) ORDER BY id;
+> ID
+> --
+> 1
+> 2
+> 3
+> rows (ordered): 3
+
+SELECT * FROM (SELECT * FROM TEST) x ORDER BY id;
+> ID
+> --
+> 1
+> 2
+> 3
+> rows (ordered): 3
+
+drop table test;
+> ok
+
 select top sum(1) 0 from dual;
 > exception
 

h2/src/test/org/h2/test/unit/SelfDestructor.java

@@ -32,6 +32,7 @@ public class SelfDestructor extends Thread {
                             // ignore
                         }
                     }
+                    System.out.println("Killing the process after " + minutes + " minutes");
                     Runtime.getRuntime().halt(1);
                 }
             };