Trying less restrictive lazy eval case

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

@@ -665,15 +665,21 @@ public class Select extends Query {
     }
 
     private boolean hasRecursiveTableView() {
-        // go through the table filters to see if we have a recursive table query
-        for (TableFilter f : filters) {
-            if(f.getTable().isTableExpression()){
-                TableView v = (TableView)f.getTable();
+//        // go through the table filters to see if we have a recursive table query
+//        for (TableFilter f : filters) {
+//            if(f.getTable().isTableExpression()){
+//                TableView v = (TableView)f.getTable();
+//                if(v.isRecursive()){
+//                    return true;
+//                }
+//            }
+//        }
+        if(this.topTableFilter.getTable().isTableExpression()){
+            TableView v = (TableView)this.topTableFilter.getTable();
             if(v.isRecursive()){
                 return true;
             }
         }
-        }
         return false;
     }
 

h2/src/test/org/h2/test/mvcc/TestMvccMultiThreaded2.java

@@ -76,18 +76,19 @@ public class TestMvccMultiThreaded2 extends TestBase {
         // give any of the 100 threads a chance to start by yielding the processor to them
         Thread.yield();
         
-        // make sure all threads have stopped by joining with them
+        // gather stats on threads after they finished
         @SuppressWarnings("unused")
         int minProcessed=Integer.MAX_VALUE, maxProcessed=0, totalProcessed=0;
         
         for (SelectForUpdate sfu : threads) {
+            // make sure all threads have stopped by joining with them
             sfu.join();
-            totalProcessed+=sfu.interationsProcessed;
-            if(sfu.interationsProcessed>maxProcessed){
-                maxProcessed = sfu.interationsProcessed;
+            totalProcessed+=sfu.iterationsProcessed;
+            if(sfu.iterationsProcessed>maxProcessed){
+                maxProcessed = sfu.iterationsProcessed;
             }
-            if(sfu.interationsProcessed<minProcessed){
-                minProcessed = sfu.interationsProcessed;
+            if(sfu.iterationsProcessed<minProcessed){
+                minProcessed = sfu.iterationsProcessed;
             }
         }
         
@@ -104,7 +105,7 @@ public class TestMvccMultiThreaded2 extends TestBase {
 
     private class SelectForUpdate extends Thread {
         
-        public int interationsProcessed = 0;
+        public int iterationsProcessed = 0;
 
         @Override
         public void run() {
@@ -129,7 +130,7 @@ public class TestMvccMultiThreaded2 extends TestBase {
                         assertTrue(rs.getInt(2) == 100);
 
                         conn.commit();
-                        interationsProcessed++;
+                        iterationsProcessed++;
 
                         long now = System.currentTimeMillis();
                         if (now - start > 1000 * TEST_TIME_SECONDS){