Fixed bug in metadata locking

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Fixed bug in metadata locking, obscure combination of DDL and SELECT SEQUENCE.NEXTVAL required
+</li>
 <li>Added index hints: SELECT * FROM TEST USE INDEX (idx1, idx2)
 </li>
 <li>Add a test case to ensure that spatial index is used with and order by command by Fortin N

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

@@ -918,6 +918,7 @@ public class Database implements DataHandler {
      */
     public void unlockMeta(Session session) {
         meta.unlock(session);
+        session.unlock(meta);
     }
 
     /**

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

@@ -47,6 +47,7 @@ public class TestDeadlock extends TestBase {
     @Override
     public void test() throws Exception {
         deleteDb("deadlock");
+        testTemporaryTablesAndMetaDataLocking();
         testDeadlockInFulltextSearch();
         testConcurrentLobReadAndTempResultTableDelete();
         testDiningPhilosophers();
@@ -397,4 +398,16 @@ public class TestDeadlock extends TestBase {
         }
     }
 
+    // there was a bug in the meta data locking here
+    private void testTemporaryTablesAndMetaDataLocking() throws Exception {
+        deleteDb("deadlock");
+        Connection conn = getConnection("deadlock");
+        Statement stmt = conn.createStatement();
+        conn.setAutoCommit(false);
+        stmt.execute("CREATE SEQUENCE IF NOT EXISTS SEQ1 START WITH 1000000");
+        stmt.execute("CREATE FORCE VIEW V1 AS WITH RECURSIVE TEMP(X) AS (SELECT x FROM DUAL) SELECT * FROM TEMP");
+        stmt.executeQuery("SELECT SEQ1.NEXTVAL");
+        conn.close();
+    }
+
 }