Triggers (including the fulltext search) could throw the exception 'Unexpected…

Triggers (including the fulltext search) could throw the exception 'Unexpected code path' in Session.log.

h2/src/main/org/h2/command/ddl/Analyze.java

@@ -101,8 +101,14 @@ public class Analyze extends DefineCommand {
             db.update(session, table);
         } else {
             Session s = db.getSystemSession();
-            db.update(s, table);
-            s.commit(true);
+            if (s != session) {
+                // if the current session is the system session
+                // (which is the case if we are within a trigger)
+                // then we can't update the statistics because
+                // that would unlock all locked objects
+                db.update(s, table);
+                s.commit(true);
+            }
         }
     }
 

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

@@ -40,6 +40,7 @@ public class TestFullText extends TestBase {
     }
 
     public void test() throws Exception {
+        testAutoAnalyze();
         testNativeFeatures();
         testTransaction(false);
         testCreateDrop();
@@ -73,6 +74,28 @@ public class TestFullText extends TestBase {
         deleteDb("fullTextReopen");
     }
 
+    private void testAutoAnalyze() throws SQLException {
+        if (config.memory) {
+            return;
+        }
+        deleteDb("fullTextNative");
+        Connection conn;
+        Statement stat;
+
+        conn = getConnection("fullTextNative");
+        stat = conn.createStatement();
+        stat.execute("create alias if not exists ft_init for \"org.h2.fulltext.FullText.init\"");
+        stat.execute("call ft_init()");
+        stat.execute("create table test(id int primary key, name varchar)");
+        stat.execute("call ft_create_index('PUBLIC', 'TEST', 'NAME')");
+        conn.close();
+
+        conn = getConnection("fullTextNative");
+        stat = conn.createStatement();
+        stat.execute("insert into test select x, 'x' from system_range(1, 3000)");
+        conn.close();
+    }
+
     private void testNativeFeatures() throws SQLException {
         if (config.memory) {
             return;