Large result sets now always create temporary tables instead of temporary files.

h2/src/main/org/h2/command/dml/SelectUnion.java

@@ -191,8 +191,8 @@ public class SelectUnion extends Query {
         default:
             DbException.throwInternalError("type=" + unionType);
         }
-        ResultInterface l = left.query(0);
-        ResultInterface r = right.query(0);
+        LocalResult l = left.query(0);
+        LocalResult r = right.query(0);
         l.reset();
         r.reset();
         switch (unionType) {
@@ -242,6 +242,8 @@ public class SelectUnion extends Query {
                 result.setLimit(v.getInt());
             }
         }
+        l.close();
+        r.close();
         result.done();
         if (target != null) {
             while (result.next()) {

h2/src/main/org/h2/mvstore/db/MVTable.java

@@ -711,6 +711,8 @@ public class MVTable extends TableBase {
             if (index.getName() != null) {
                 database.removeSchemaObject(session, index);
             }
+            // needed for session temporary indexes
+            indexes.remove(index);
         }
         if (SysProperties.CHECK) {
             for (SchemaObject obj : database.getAllSchemaObjects(DbObject.INDEX)) {

h2/src/main/org/h2/mvstore/db/TransactionStore.java

@@ -762,10 +762,6 @@ public class TransactionStore {
          * Commit the transaction. Afterwards, this transaction is closed.
          */
         public void commit() {
-            if (status == STATUS_CLOSED) {
-                // TODO analyze why this happens
-                return;
-            }
             checkNotClosed();
             store.commit(this, logId);
         }

h2/src/main/org/h2/result/ResultTempTable.java

@@ -114,7 +114,6 @@ public class ResultTempTable implements ResultExternal {
         IndexType indexType = IndexType.createNonUnique(true);
         index = table.addIndex(session, indexName, indexId, indexCols,
                 indexType, true, null);
-        index.setTemporary(true);
     }
 
     @Override
@@ -221,12 +220,21 @@ public class ResultTempTable implements ResultExternal {
             // time. (the table is truncated, so this is just one record)
             if (!database.isSysTableLocked()) {
                 Session sysSession = database.getSystemSession();
+                table.removeChildrenAndResources(sysSession);
                 if (index != null) {
-                    index.removeChildrenAndResources(sysSession);
+                    // need to explicitly do this, 
+                    // as it's not registered in the system session
+                    session.removeLocalTempTableIndex(index);
                 }
-                table.removeChildrenAndResources(sysSession);
                 // the transaction must be committed immediately
-                sysSession.commit(false);
+                // TODO this synchronization cascade is very ugly
+                synchronized (session) {
+                    synchronized (database) {
+                        synchronized (sysSession) {
+                            sysSession.commit(false);
+                        }
+                    }
+                }
             }
         } finally {
             table = null;

h2/src/main/org/h2/table/RegularTable.java

@@ -700,6 +700,8 @@ public class RegularTable extends TableBase {
             if (index.getName() != null) {
                 database.removeSchemaObject(session, index);
             }
+            // needed for session temporary indexes
+            indexes.remove(index);
         }
         if (SysProperties.CHECK) {
             for (SchemaObject obj : database.getAllSchemaObjects(DbObject.INDEX)) {

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

@@ -386,13 +386,7 @@ java org.h2.test.TestAll timer
         // use lower values, to better test those cases,
         // and to speed up the tests (for delays)
   
-        ; // TEST
-//        System.setProperty("h2.maxMemoryRows", "2");
-        
-        System.setProperty("h2.maxMemoryRows", "10");
-//        System.setProperty("h2.maxMemoryRows", "1000");
-//        System.setProperty("h2.maxMemoryRows", "2");
-        
+        System.setProperty("h2.maxMemoryRows", "100");
         
         System.setProperty("h2.check2", "true");
         System.setProperty("h2.delayWrongPasswordMin", "0");