Feature flags for version 1.4

h2/src/main/org/h2/engine/Constants.java

@@ -100,7 +100,7 @@ public class Constants {
     /**
      * The minor version of this database.
      */
-    public static final int VERSION_MINOR = 3;
+    public static final int VERSION_MINOR = 4;
 
     /**
      * The lock mode that means no locking is used at all.

h2/src/main/org/h2/engine/Database.java

@@ -235,7 +235,7 @@ public class Database implements DataHandler {
             this.mode = Mode.getInstance(modeName);
         }
         this.multiVersion =
-                ci.getProperty("MVCC", Constants.VERSION_MINOR >= 4);
+                ci.getProperty("MVCC", dbSettings.mvStore);
         this.logMode =
                 ci.getProperty("LOG", PageStore.LOG_MODE_SYNC);
         this.javaObjectSerializerName =
@@ -2245,7 +2245,7 @@ public class Database implements DataHandler {
 
     public void setMultiThreaded(boolean multiThreaded) {
         if (multiThreaded && this.multiThreaded != multiThreaded) {
-            if (multiVersion) {
+            if (multiVersion && mvStore == null) {
                 // currently the combination of MVCC and MULTI_THREADED is not
                 // supported
                 throw DbException.get(

h2/src/main/org/h2/engine/SysProperties.java

@@ -318,7 +318,7 @@ public class SysProperties {
      * Limited support for the old-style Oracle outer join with "(+)".
      */
     public static final boolean OLD_STYLE_OUTER_JOIN =
-            Utils.getProperty("h2.oldStyleOuterJoin", 
+            Utils.getProperty("h2.oldStyleOuterJoin",
                     Constants.VERSION_MINOR >= 4 ? false : true);
 
     /**
@@ -401,7 +401,7 @@ public class SysProperties {
      * taken into account.
      */
     public static final boolean STORE_LOCAL_TIME =
-            Utils.getProperty("h2.storeLocalTime", 
+            Utils.getProperty("h2.storeLocalTime",
                     Constants.VERSION_MINOR >= 4 ? true : false);
 
     /**