--no commit message

--no commit message

h2/src/docsrc/help/help.csv

@@ -439,6 +439,10 @@ ON tableName ( indexColumn [,...] )
 ","
 Creates a new index.
 This command commits an open transaction.
+
+Hash indexes are kept in memory. They can only test for equality, and do not support 
+range queries (similar to a hash table). They do support non-unique keys.
+A multi-column hash index is only used if all column values are known.
 ","
 CREATE INDEX IDXNAME ON TEST(NAME)
 "

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,10 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Fulltext search: exceptions within the fulltext seach package had the wrong SQL state.
+<ul><li>Result sets larger than 2 GB threw an exception "Negative seek offset". Fixed.
+</li><li>If the system property h2.check was set to false, an ArrayIndexOutOfBoundsException could occur.
+</li><li>Alter table is now supported even if a table has views defined.
+</li><li>Fulltext search: exceptions within the fulltext search package had the wrong SQL state.
 </li><li>The Lucene fulltext search ignored transaction rollback. Fixed using a trigger on rollback.
 </li><li>Trigger can now be called on rollback.
 </li><li>The shell script h2.sh ignored command line line arguments.

h2/src/docsrc/html/roadmap.html

@@ -40,7 +40,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 <h2>Priority 2</h2>
 <ul>
 <li>Improve test code coverage
-</li><li>Enable warning for 'Local variable declaration hides another field or variable'.
 </li><li>Test multi-threaded in-memory db access
 </li><li>MVCC: select for update should only lock the selected rows.
 </li><li>Option to shutdown all the running servers (on the same VM).

h2/src/main/org/h2/util/ByteUtils.java

@@ -38,6 +38,19 @@ public class ByteUtils {
         return ((long) (readInt(buff, pos)) << 32) + (readInt(buff, pos + 4) & 0xffffffffL);
     }
 
+    /**
+     * Write a long value to the byte array.
+     *
+     * @param buffthe byte array
+     * @param pos the position
+     * @param x the value
+     */
+    public static void writeLong(byte[] buff, int pos, long x) {
+        for (int i = 0; i < 8; i++) {
+            buff[pos + i] = (byte) ((x >> (8 * (8 - i))) & 255);
+        }
+    }
+
     /**
      * Calculate the index of the first occurrence of the pattern in the byte
      * array, starting with the given index. This methods returns -1 if the

h2/src/main/org/h2/util/IOUtils.java

@@ -291,7 +291,7 @@ public class IOUtils {
      * @param buffer the output buffer
      * @param off the offset in the buffer
      * @param max the number of bytes to read at most
-     * @return the number of bytes read
+     * @return the number of bytes read, 0 meaning EOF
      */
     public static int readFully(InputStream in, byte[] buffer, int off, int max) throws IOException {
         int len = Math.min(max, buffer.length);

h2/src/main/org/h2/util/Profiler.java

@@ -178,4 +178,12 @@ public class Profiler implements Runnable {
         return buff.toString();
     }
 
+    public int getInterval() {
+        return interval;
+    }
+
+    public void setInterval(int interval) {
+        this.interval = interval;
+    }
+
 }