Documentation.

h2/src/docsrc/help/help.csv

@@ -71,7 +71,8 @@ DELETE FROM TEST WHERE ID=2
 "Commands (DML)","BACKUP","
 BACKUP TO fileNameString
 ","
-Backs up the database files to a .zip file. Objects are not locked.
+Backs up the database files to a .zip file. Objects are not locked, but
+the backup is transactionally consistent because the transaction log is also copied.
 Admin rights are required to execute this command.
 ","
 BACKUP TO 'backup.zip'

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,10 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>The wrong exception was thrown when trying to connect to a server if the server was not running.
+</li><li>UNION queries where the first query contains a nested query were parsed incorrectly.
+    Example: "select 1 from (select 2 from dual) union select 3 from dual" was parsed as
+    "select 1 from ((select 2 from dual) union select 3 from dual)". Fixed.
 </li></ul>
 
 <h2>Version 1.2.138 (2010-06-27)</h2>

h2/src/docsrc/html/roadmap.html

@@ -92,6 +92,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Recursive Queries (see details).
 </li><li>Eclipse plugin.
 </li><li>Asynchronous queries to support publish/subscribe: SELECT ... FOR READ WAIT [maxMillisToWait].
+    See also MS SQL Server "Query Notification".
 </li><li>Fulltext search Lucene: analyzer configuration.
 </li><li>Fulltext search (native): reader / tokenizer / filter.
 </li><li>Linked schema using CSV files: one schema for a directory of files; support indexes for CSV files.
@@ -249,7 +250,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Remember the user defined data type (domain) of a column
 </li><li>Support Jackcess (MS Access databases)
 </li><li>Built-in methods to write large objects (BLOB and CLOB): FILE_WRITE('test.txt', 'Hello World')
-</li><li>MVCC: support transactionally consistent backups using SCRIPT
+</li><li>MVCC: support transactionally consistent backups using SCRIPT.
 </li><li>Improve time to open large databases (see mail 'init time for distributed setup')
 </li><li>Move Maven 2 repository from hsql.sf.net to h2database.sf.net
 </li><li>Java 1.5 tool: JdbcUtils.closeSilently(s1, s2,...)
@@ -465,7 +466,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Optimizer: WHERE X=? AND Y IN(?), it always uses the index on Y. Should be cost based.
 </li><li>Support ALTER SCHEMA name RENAME TO newName (rename schema).
 </li><li>Make the cache scan resistant (currently a small cache is faster than a large cache for large table scans).
-</li><li>Issue 178: Optimizer: index usage when both ascending and descending indexes are available
+</li><li>Issue 178: Optimizer: index usage when both ascending and descending indexes are available.
 </li><li>Issue 179: Related subqueries in HAVING clause
 </li><li>IBM DB2 compatibility: NOT NULL WITH DEFAULT. Similar to MySQL Mode.convertInsertNullToZero.
 </li><li>Creating primary key: always create a constraint.
@@ -484,6 +485,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Allow to access the database over HTTP (possibly using port 80) and a servlet in a REST way.
 </li><li>ODBC: encrypted databases are not supported because the ;CIPHER= can not be set.
 </li><li>Support CLOB and BLOB update, specially conn.createBlob().setBinaryStream(1);
+</li><li>Optimizer: index usage when both ascending and descending indexes are available. Issue 178.
 </li><li>Triggers: support user defined execution order. Oracle:
     CREATE OR REPLACE TRIGGER TEST_2 BEFORE INSERT
     ON TEST FOR EACH ROW FOLLOWS TEST_1.
@@ -502,8 +504,11 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Triggers: NOT NULL checks should be done after running triggers (Oracle behavior, maybe others).
 </li><li>Log long running transactions (similar to long running statements).
 </li><li>Support schema specific domains.
+</li><li>Parameter data type is data type of other operand. Issue 205.
 </li><li>Some combinations of nested join with right outer join are not supported.
 </li><li>DatabaseEventListener.openConnection(id) and closeConnection(id).
+</li><li>Compatibility for data type CHAR (Derby, HSQLDB). Issue 212.
+</li><li>Compatibility with MySQL TIMESTAMPDIFF. Issue 209.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/main/org/h2/tools/Recover.java

@@ -487,7 +487,7 @@ public class Recover extends Tool implements DataHandler {
                 setStorage(s.readVarInt());
                 int columnCount = s.readVarInt();
                 int entries = s.readShortInt();
-                writer.println("-- page " + page + ": data leaf " + (last ? "(last)" : "") + " parent: " + parentPageId +
+                writer.println("-- page " + page + ": data leaf " + (last ? "(last) " : "") + "parent: " + parentPageId +
                         " table: " + storageId + " entries: " + entries + " columns: " + columnCount);
                 dumpPageDataLeaf(writer, s, last, page, columnCount, entries);
                 break;
@@ -499,15 +499,15 @@ public class Recover extends Tool implements DataHandler {
                 setStorage(s.readVarInt());
                 int rowCount = s.readInt();
                 int entries = s.readShortInt();
-                writer.println("-- page " + page + ": data node " + (last ? "(last)" : "") + " parent: " + parentPageId +
-                        " entries: " + entries + " rowCount: " + rowCount);
+                writer.println("-- page " + page + ": data node " + (last ? "(last) " : "") + "parent: " + parentPageId +
+                        " table: " + storageId + " entries: " + entries + " rowCount: " + rowCount);
                 dumpPageDataNode(writer, s, page, entries);
                 break;
             }
             // type 3
             case Page.TYPE_DATA_OVERFLOW:
                 stat.pageTypeCount[type]++;
-                writer.println("-- page " + page + ": data overflow " + (last ? "(last)" : ""));
+                writer.println("-- page " + page + ": data overflow " + (last ? "(last) " : ""));
                 break;
             // type 4
             case Page.TYPE_BTREE_LEAF: {
@@ -515,7 +515,7 @@ public class Recover extends Tool implements DataHandler {
                 int parentPageId = s.readInt();
                 setStorage(s.readVarInt());
                 int entries = s.readShortInt();
-                writer.println("-- page " + page + ": b-tree leaf " + (last ? "(last)" : "") + " parent: " + parentPageId +
+                writer.println("-- page " + page + ": b-tree leaf " + (last ? "(last) " : "") + "parent: " + parentPageId +
                         " index: " + storageId + " entries: " + entries);
                 if (trace) {
                     dumpPageBtreeLeaf(writer, s, entries, !last);
@@ -527,7 +527,7 @@ public class Recover extends Tool implements DataHandler {
                 stat.pageTypeCount[type]++;
                 int parentPageId = s.readInt();
                 setStorage(s.readVarInt());
-                writer.println("-- page " + page + ": b-tree node" + (last ? "(last)" : "") +  " parent: " + parentPageId +
+                writer.println("-- page " + page + ": b-tree node " + (last ? "(last) " : "") +  "parent: " + parentPageId +
                         " index: " + storageId);
                 dumpPageBtreeNode(writer, s, page, !last);
                 break;