--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Parser: sequenceName.NEXTVAL and CURRVAL did not respect the schema search path.
+<ul><li>Issue 111: Multi-version concurrency / duplicate primary key after rollback.
+</li><li>Issue 110: Multi-version concurrency / wrong exception is thrown.
+</li><li>Parser: sequenceName.NEXTVAL and CURRVAL did not respect the schema search path.
 </li><li>The following sequence could throw the exception "Row not found when trying to delete":
     start a transaction, insert many rows, delete many rows, rollback. The number of rows depends
     on the cache size.

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -115,7 +115,7 @@ public class JdbcConnection extends TraceObject implements Connection {
             if (isInfoEnabled()) {
                 trace.infoCode("Connection " + getTraceObjectName()
                         + " = DriverManager.getConnection(" + quote(ci.getOriginalURL())
-                        + ", " + quote(user) + ", \"\")");
+                        + ", " + quote(user) + ", \"\");");
             }
             this.url = ci.getURL();
             openStackTrace = new Exception("Stack Trace");

h2/src/main/org/h2/message/Trace.java

@@ -191,17 +191,6 @@ public class Trace {
         }
     }
 
-    /**
-     * Write Java source code with trace level INFO to the trace system.
-     *
-     * @param java the source code
-     */
-    public void infoCode(String java) {
-        if (isEnabled(TraceSystem.INFO)) {
-            traceWriter.write(TraceSystem.INFO, module, lineSeparator + "/**/" + java, null);
-        }
-    }
-
     /**
      * Write a SQL statement with trace level INFO to the trace system.
      *
@@ -269,6 +258,17 @@ public class Trace {
         }
     }
 
+    /**
+     * Write Java source code with trace level INFO to the trace system.
+     *
+     * @param java the source code
+     */
+    public void infoCode(String java) {
+        if (isEnabled(TraceSystem.INFO)) {
+            traceWriter.write(TraceSystem.INFO, module, lineSeparator + "/**/" + java, null);
+        }
+    }
+
     /**
      * Write Java source code with trace level DEBUG to the trace system.
      *

h2/src/main/org/h2/result/Row.java

@@ -95,10 +95,12 @@ public class Row extends Record implements SearchRow {
             buff.append(" deleted");
         }
         buff.append(" */ ");
+        if (data != null) {
             for (Value v : data) {
                 buff.appendExceptFirst(", ");
                 buff.append(v == null ? "null" : v.getTraceSQL());
             }
+        }
         return buff.append(')').toString();
     }
 

h2/src/test/org/h2/test/TestAll.java

@@ -293,8 +293,16 @@ java org.h2.test.TestAll timer
         System.setProperty("h2.maxMemoryRowsDistinct", "128");
         System.setProperty("h2.check2", "true");
 
+int test2;
+//System.setProperty("h2.optimizeInList", "true");
 /*
 
+OPTIMIZE_IN_LIST
+
+use ... parameters (main, Message.getSQLException, trace?)
+
+H2 Console: if number of items is low (calculate that first), display data types, otherwise not.
+Always display indexes and views in all schemas.
 -------------
 
 create a short documentation

h2/src/test/org/h2/test/unit/TestAutoReconnect.java

@@ -46,6 +46,7 @@ public class TestAutoReconnect extends TestBase implements DatabaseEventListener
                 connServer.createStatement().execute("SHUTDOWN");
                 connServer.close();
             }
+            org.h2.Driver.load();
             connServer = DriverManager.getConnection(url);
         } else {
             server.stop();