Documentation.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The H2 Console can now be used within another application, in a frame or iframe. Issue 197.
+<ul><li>Profiler: improved message if there was no stack trace.
+</li><li>The H2 Console can now be used within another application, in a frame or iframe. Issue 197.
 </li><li>Recover tool: the statistics section now includes page type counts again.
 </li><li>Queries with multiple IN(...) conditions sometimes return the wrong results when there was a multi-column index for the column.
 </li><li>Queries with IN(..., NULL) did sometimes return the wrong results when there was a index for the column.

h2/src/main/org/h2/api/Trigger.java

@@ -62,6 +62,7 @@ public interface Trigger {
      * The row arrays contain all columns of the table, in the same order
      * as defined in the table.
      * </p>
+     *
      * @param conn a connection to the database
      * @param oldRow the old row, or null if no old row is available (for
      *            INSERT)

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

@@ -301,11 +301,14 @@ java org.h2.test.TestAll timer
         // System.setProperty("h2.syncMethod", "");
 /*
 
-test with small freeList pages, page size 64
+change or remove documentation for FILE_LOCK=NO
 
 comparative sql tests
 
-ValueDecimal.getMemory() is slow
+reopen org.h2.test.unit.TestPageStore
+-Xmx1500m -D reopenOffset=3 -D reopenShift=1
+
+test with small freeList pages, page size 64
 
 power failure test
 power failure test: MULTI_THREADED=TRUE

h2/src/test/org/h2/test/TestBase.java

@@ -599,15 +599,16 @@ public abstract class TestBase {
     /**
      * Check if two values are equal, and if not throw an exception.
      *
+     * @param message the message to use if the check fails
      * @param expected the expected value
      * @param actual the actual value
      * @throws AssertionError if the values are not equal
      */
-    protected void assertEquals(String expected, String actual) {
+    protected void assertEquals(String message, String expected, String actual) {
         if (expected == null && actual == null) {
             return;
         } else if (expected == null || actual == null) {
-            fail("Expected: " + expected + " Actual: " + actual);
+            fail("Expected: " + expected + " Actual: " + actual + " " + message);
         }
         if (!expected.equals(actual)) {
             for (int i = 0; i < expected.length(); i++) {
@@ -625,8 +626,41 @@ public abstract class TestBase {
             if (bl > 4000) {
                 actual = actual.substring(0, 4000);
             }
-            fail("Expected: " + expected + " (" + al + ") actual: " + actual + " (" + bl + ")");
+            fail("Expected: " + expected + " (" + al + ") actual: " + actual + " (" + bl + ") " + message);
+        }
+    }
+
+    /**
+     * Check if two values are equal, and if not throw an exception.
+     *
+     * @param expected the expected value
+     * @param actual the actual value
+     * @throws AssertionError if the values are not equal
+     */
+    protected void assertEquals(String expected, String actual) {
+        assertEquals("", expected, actual);
+    }
+
+    /**
+     * Check if two result sets are equal, and if not throw an exception.
+     *
+     * @param message the message to use if the check fails
+     * @param rs0 the first result set
+     * @param rs1 the second result set
+     * @throws AssertionError if the values are not equal
+     */
+    protected void assertEquals(String message, ResultSet rs0, ResultSet rs1) throws SQLException {
+        ResultSetMetaData meta = rs0.getMetaData();
+        int columns = meta.getColumnCount();
+        assertEquals(columns, rs1.getMetaData().getColumnCount());
+        while (rs0.next()) {
+            assertTrue(message, rs1.next());
+            for (int i = 0; i < columns; i++) {
+                assertEquals(message, rs0.getString(i + 1), rs1.getString(i + 1));
+           }
         }
+        assertFalse(message, rs0.next());
+        assertFalse(message, rs1.next());
     }
 
     /**

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -644,4 +644,4 @@ pulakka pagination collide visual aejaks simulation joonas finland minneapolis
 determine timestampdiff harmony doap shortdesc wireless iceland sigurdsson
 darri chunks bjorn chunked watson regardless usefulinc represented pushd
 recorder grajciar recording slovensky uninitialized arriving lubomir unchanged
-erik dick
+erik dick calculations