Documentation.

h2/src/docsrc/help/help.csv

@@ -92,7 +92,7 @@ CALL 15*25
 "
 
 "Commands (DML)","EXPLAIN","
-EXPLAIN { [ PLAN FOR ] | ANALYZE } { select | insert | update | delete }
+EXPLAIN { [ PLAN FOR ] | ANALYZE } { select | insert | update | delete | merge }
 ","
 Shows the execution plan for a statement.
 When using EXPLAIN ANALYZE, the statement is actually executed, and the query plan

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Issue 266: Domains: a NOT NULL clause in a domain definition ignored.
+<ul><li>EXPLAIN SELECT didn't include the sample size if one was set.
+</li><li>Improved EXPLAIN plan formatting and documentation.
+</li><li>Issue 266: Domains: a NOT NULL clause in a domain definition ignored.
 </li><li>More accurate calculation of variance and standard deviation for large number of samples with low variance
     (now using Welford's method).
 </li><li>Server: CLOB data with unicode characters between character code 0xd800 and 0xdfff

h2/src/docsrc/html/roadmap.html

@@ -254,6 +254,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Oracle: support DECODE method (convert to CASE WHEN).
 </li><li>Native search: support "phrase search", wildcard search (* and ?), case-insensitive search, boolean operators, and grouping
 </li><li>Improve documentation of access rights
+</li><li>Support opening a database that is in the classpath, maybe using a new file system. Workaround: detect jar file using getClass().getProtectionDomain().getCodeSource().getLocation().
 </li><li>Support ENUM data type (see MySQL, PostgreSQL, MS SQL Server, maybe others)
 </li><li>Remember the user defined data type (domain) of a column
 </li><li>MVCC: support multi-threaded kernel with multi-version concurrency.
@@ -290,7 +291,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>MySQL compatibility: real SQL statement for DESCRIBE TEST
 </li><li>Use a default delay of 1 second before closing a database.
 </li><li>Write (log) to system table before adding to internal data structures.
-</li><li>Support opening a database that is in the classpath, maybe using a new file system.
 </li><li>Doclet (javadocs): constructors are not listed.
 </li><li>Support direct lookup for MIN and MAX when using WHERE (see todo.txt / Direct Lookup).
 </li><li>Support other array types (String[], double[]) in PreparedStatement.setObject(int, Object);

h2/src/docsrc/html/tutorial.html

@@ -540,7 +540,7 @@ Shutting down a TCP server can be protected using the option <code>-tcpPassword<
 This database supports Hibernate version 3.1 and newer. You can use the HSQLDB Dialect,
 or the native H2 Dialect. Unfortunately the H2 Dialect included in some old versions of Hibernate was buggy.
 A <a href="http://opensource.atlassian.com/projects/hibernate/browse/HHH-3401">patch
-for Hibernate</a> has been submitted and is now applied. 
+for Hibernate</a> has been submitted and is now applied.
 You can rename it to <code>H2Dialect.java</code> and include this as a patch in your application,
 or upgrade to a version of Hibernate where this is fixed.
 </p>

h2/src/main/org/h2/res/help.csv

@@ -36,7 +36,7 @@ CALL expression
 ","
 Calculates a simple expression."
 "Commands (DML)","EXPLAIN","
-EXPLAIN { [ PLAN FOR ] | ANALYZE } { select | insert | update | delete }
+EXPLAIN { [ PLAN FOR ] | ANALYZE } { select | insert | update | delete | merge }
 ","
 Shows the execution plan for a statement."
 "Commands (DML)","MERGE","

h2/src/main/org/h2/store/Data.java

@@ -1119,6 +1119,12 @@ public class Data {
         }
     }
 
+    /**
+     * Copy a String from a reader to an output stream.
+     *
+     * @param source the reader
+     * @param target the output stream
+     */
     public static void copyString(Reader source, OutputStream target) throws IOException {
         char[] buff = new char[Constants.IO_BUFFER_SIZE];
         Data d = new Data(null, new byte[3 * Constants.IO_BUFFER_SIZE]);

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

@@ -661,7 +661,8 @@ pyankov enctype multipart boundary mistake enlarge demonstrates aggregating
 bypassing khtml doubled inlined defragmented registers leftover ugly artificially
 presentation defragment queried activities knut tailored dhis statistical norway
 mailto dong adconion edong twitter consortium ogc geo geospatial flexibility
-mbeans unregisters subtracting multiplying dividing contended bindings 
+mbeans unregisters subtracting multiplying dividing contended bindings
 projection managing observer misuse windowed discriminator abort familiar rice
-reachable mind develop disposition extras arithmetics readwrite syncable 
-requeried requery closable curr outdated
+reachable mind develop disposition extras arithmetics readwrite syncable
+requeried requery closable curr outdated market accurate borg theis welford
+ooq exceeded eye