Merge remote-tracking branch 'origin/master' into Issue#628

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Reset transaction start timestamp on ROLLBACK
+</li>
 <li>Issue #632: CREATE OR REPLACE VIEW creates incorrect columns names
 </li>
 <li>Issue #630: Integer overflow in CacheLRU can cause unrestricted cache growth

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

@@ -737,6 +737,7 @@ public class Session extends SessionWithState {
     public void rollback() {
         checkCommitRollback();
         currentTransactionName = null;
+        transactionStart = 0;
         boolean needCommit = false;
         if (undoLog.size() > 0) {
             rollbackTo(null, false);
@@ -1105,6 +1106,8 @@ public class Session extends SessionWithState {
      */
     public void rollbackToSavepoint(String name) {
         checkCommitRollback();
+        currentTransactionName = null;
+        transactionStart = 0;
         if (savepoints == null) {
             throw DbException.get(ErrorCode.SAVEPOINT_IS_INVALID_1, name);
         }