roll back special handling of meta table on index opening

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

@@ -844,9 +844,15 @@ public class Database implements DataHandler {
         }
     }
 
+
     private void handleUpgradeIssues() {
         if (mvStore != null && !isReadOnly()) {
             MVStore store = mvStore.getStore();
+            // Version 1.4.197 erroneously handles index on SYS_ID.ID as secondary
+            // and does not delegate to scan index as it should.
+            // This code will try to fix that by converging ROW_ID and ID,
+            // since they may have got out of sync, and by removing map "index.0",
+            // which corresponds to a secondary index.
             if (store.hasMap("index.0")) {
                 Index scanIndex = meta.getScanIndex(systemSession);
                 Cursor curs = scanIndex.find(systemSession, null, null);

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

@@ -506,8 +506,8 @@ public class MVTable extends TableBase {
         int mainIndexColumn = primaryIndex.getMainIndexColumn() != SearchRow.ROWID_INDEX
                 ? SearchRow.ROWID_INDEX : getMainIndexColumn(indexType, cols);
         if (database.isStarting()) {
-            // if this is not "SYS_ID" table and index does exists as a separate map
-            if (indexId != 0 && transactionStore.hasMap("index." + indexId)) {
+            // if index does exists as a separate map it can't be a delegate
+            if (transactionStore.hasMap("index." + indexId)) {
                 // we can not reuse primary index
                 mainIndexColumn = SearchRow.ROWID_INDEX;
             }