Remove MVCC setting from some connection URLs in tests

h2/src/test/org/h2/test/db/TestGeneralCommonTableQueries.java

@@ -529,7 +529,7 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp
         try {
             // Test with settings: lazy mvStore memory mvcc multiThreaded
             // connection url is
-            // mem:script;MV_STORE=true;LOG=1;LOCK_TIMEOUT=50;MVCC=TRUE;
+            // mem:script;MV_STORE=true;LOG=1;LOCK_TIMEOUT=50;
             // MULTI_THREADED=TRUE;LAZY_QUERY_EXECUTION=1
             config.lazy = true;
             config.mvStore = true;

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

@@ -76,9 +76,9 @@ public class TestMvcc1 extends TestBase {
         //     selects new data (select * from test where id > ?) and deletes
 
         deleteDb("mvcc1");
-        c1 = getConnection("mvcc1;MVCC=TRUE;LOCK_TIMEOUT=10");
+        c1 = getConnection("mvcc1;LOCK_TIMEOUT=10");
         s1 = c1.createStatement();
-        c2 = getConnection("mvcc1;MVCC=TRUE;LOCK_TIMEOUT=10");
+        c2 = getConnection("mvcc1;LOCK_TIMEOUT=10");
         s2 = c2.createStatement();
         c1.setAutoCommit(false);
         c2.setAutoCommit(false);

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

@@ -92,7 +92,7 @@ public class TestMvccMultiThreaded extends TestBase {
         final Connection[] connList = new Connection[len];
         for (int i = 0; i < len; i++) {
             Connection conn = getConnection(
-                    getTestName() + ";MVCC=TRUE;LOCK_TIMEOUT=500");
+                    getTestName() + ";LOCK_TIMEOUT=500");
             connList[i] = conn;
         }
         Connection conn = connList[0];
@@ -129,8 +129,7 @@ public class TestMvccMultiThreaded extends TestBase {
         int len = 2;
         final Connection[] connList = new Connection[len];
         for (int i = 0; i < len; i++) {
-            connList[i] = getConnection(
-                    getTestName() + ";MVCC=TRUE");
+            connList[i] = getConnection(getTestName());
         }
         Connection conn = connList[0];
         conn.createStatement().execute(

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

@@ -24,7 +24,7 @@ public class TestMvccMultiThreaded2 extends TestBase {
     private static final int TEST_TIME_SECONDS = 60;
     private static final boolean DISPLAY_STATS = false;
 
-    private static final String URL = ";MVCC=TRUE;LOCK_TIMEOUT=120000;MULTI_THREADED=TRUE";
+    private static final String URL = ";LOCK_TIMEOUT=120000;MULTI_THREADED=TRUE";
 
     /**
      * Run just this test.

h2/src/test/org/h2/test/rowlock/TestRowLocks.java

@@ -38,7 +38,9 @@ public class TestRowLocks extends TestBase {
     @Override
     public void test() throws Exception {
         testSetMode();
-        testCases();
+        if (config.mvStore) {
+            testCases();
+        }
         deleteDb(getTestName());
     }
 
@@ -55,7 +57,7 @@ public class TestRowLocks extends TestBase {
 
     private void testCases() throws Exception {
         deleteDb(getTestName());
-        c1 = getConnection(getTestName() + ";MVCC=TRUE");
+        c1 = getConnection(getTestName());
         s1 = c1.createStatement();
         s1.execute("SET LOCK_TIMEOUT 10000");
         s1.execute("CREATE TABLE TEST AS " +

h2/src/test/org/h2/test/store/TestMVTableEngine.java

@@ -506,7 +506,7 @@ public class TestMVTableEngine extends TestBase {
         Statement stat;
         Statement stat2;
         deleteDb(getTestName());
-        String url = getTestName() + ";MV_STORE=TRUE;MVCC=TRUE";
+        String url = getTestName() + ";MV_STORE=TRUE";
         url = getURL(url, true);
         conn = getConnection(url);
         stat = conn.createStatement();
@@ -563,7 +563,7 @@ public class TestMVTableEngine extends TestBase {
         Statement stat;
         Statement stat2;
         deleteDb(getTestName());
-        String url = getTestName() + ";MV_STORE=TRUE;MVCC=TRUE";
+        String url = getTestName() + ";MV_STORE=TRUE";
         url = getURL(url, true);
         conn = getConnection(url);
         stat = conn.createStatement();
@@ -593,7 +593,7 @@ public class TestMVTableEngine extends TestBase {
         Statement stat;
         Statement stat2;
         deleteDb(getTestName());
-        String url = getTestName() + ";MV_STORE=TRUE;MVCC=TRUE";
+        String url = getTestName() + ";MV_STORE=TRUE";
         url = getURL(url, true);
         conn = getConnection(url);
         stat = conn.createStatement();