Statement.setQueryTimeout did not work correctly for some statements.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>CREATE DOMAIN: Built-in data types can now only be changed if no tables exist.
+<ul><li>Statement.setQueryTimeout did not work correctly for some statements.
+</li><li>CREATE DOMAIN: Built-in data types can now only be changed if no tables exist.
 </li><li>Linked tables: a workaround for Oracle DATE columns has been implemented.
 </li><li>DatabaseMetaData.getPrimaryKeys: The column PK_NAME now contains the
     constraint name instead of the index name (compatibility for PostgreSQL and Derby).

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

@@ -831,7 +831,7 @@ public class Session implements SessionInterface {
     public void setCurrentCommand(Command command, long startTime) {
         this.currentCommand = command;
         this.currentCommandStart = startTime;
-        if (queryTimeout > 0) {
+        if (queryTimeout > 0 && startTime != 0) {
             cancelAt = startTime + queryTimeout;
         }
     }