--no commit message

--no commit message

h2/src/docsrc/help/help.csv

@@ -1349,21 +1349,20 @@ SET WRITE_DELAY 2000
 "
 
 "Commands (Other)","SHUTDOWN","
-SHUTDOWN [ IMMEDIATELY | COMPACT | SCRIPT ]
+SHUTDOWN [ IMMEDIATELY | COMPACT ]
 ","
-This statement is closes all open connections to the database and closes the
-database. This command usually does not need to be used, as the database is
+This statement closes all open connections to the database and closes the
+database. This command is usually not required, as the database is
 closed automatically when the last connection to it is closed.
 
-If no option is used, then all connections are closed. If the IMMEDIATELY option
-is used, the database files are closed as if the hard drive stops working,
-without rollback of the open transactions; otherwise any open transaction are
-rolled back before closing the connection. COMPACT and SCRIPT are only supported
-for compatibility and have no effect.
+If no option is used, then the database is closed normally.
+All connections are closed, open transactions are rolled back.
+COMPACT fully compacts the database.
+IMMEDIATELY closes the database files without any cleanup.
 
 Admin rights are required to execute this command.
 ","
-SHUTDOWN
+SHUTDOWN COMPACT
 "
 
 "Other Grammar","Alias","

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,16 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>New sorted insert optimization (see Performance / Database Performance Tuning).
+<ul><li>If the database URL ends with ;PAGE_STORE=TRUE and a database in
+    the old format exists, it is automatically converted to the new page store format
+    if possible. A backup of the database is created first. Automatic conversion is not supported
+    if the database was not closed normally (if it contains uncommitted transactions).
+</li><li>Dropping the current user is now allowed if another admin user exists.
+</li><li>Values of type BINARY or BLOB could not be converted to the data type OTHER.
+</li><li>SHUTDOWN COMPACT now fully compacts the database.
+</li><li>New system properties h2.maxCompactCount and h2.maxCompactTime
+    to allow changing the default behavior (at most 2 seconds compacting when closing the database).
+</li><li>New sorted insert optimization (see Performance / Database Performance Tuning).
 </li><li>Issue 116: The files h2*-sources.jar and h2*-javadoc.jar are
     now in the Maven repository.
 </li><li>Page store: opening a large database was slow if it was not closed before.

h2/src/docsrc/html/history.html

@@ -117,6 +117,7 @@ via PayPal:
 </li><li>Christos Vasilakis, Greece
 </li><li>Fyodor Kupolov, Denmark
 </li><li>Jakob Jenkov, Denmark
+</li><li>St&eacute;phane Chartrand, Switzerland
 </li></ul>
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/docsrc/html/roadmap.html

@@ -32,9 +32,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 <ul>
 <li>Bugfixes
 </li><li>Support large updates (use the transaction log for rollback instead of persistent UndoLog.file).
-</li><li>Shutdown compact
 </li><li>More tests with MULTI_THREADED=1
-</li><li>RECOVER=1 should automatically recover, =2 should run the recovery tool if required
 </li><li>Optimization: result set caching (like MySQL)
 </li><li>Server side cursors
 </li><li>Procedural language / script language (Java, Javascript)
@@ -53,6 +51,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Support triggers for INFORMATION_SCHEMA tables (to better support PostgreSQL catalog: rebuild after creating new tables)
 </li><li>Use triggers for metadata tables; use for PostgreSQL catalog
 </li><li>Test very large databases and LOBs (up to 256 GB)
+</li><li>Support alter table add column if table has views defined
 </li><li>Support hints for the optimizer (which index to use, enforce the join order).
 </li><li>Change LOB mechanism (less files, keep index of lob files, point to files and row, delete unused files earlier, maybe bundle files into a tar file)
 </li><li>Clustering: recovery needs to becomes fully automatic. Global write lock feature.
@@ -89,7 +88,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Cost for embedded temporary view is calculated wrong, if result is constant
 </li><li>Comparison: pluggable sort order: natural sort
 </li><li>Count index range query (count(*) where id between 10 and 20)
-</li><li>Support alter table add column if table has views defined
 </li><li>Recursive Queries (see details)
 </li><li>Eclipse plugin
 </li><li>Asynchronous queries to support publish/subscribe: SELECT ... FOR READ WAIT [maxMillisToWait]
@@ -140,6 +138,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Document ROWNUM usage for reports: SELECT ROWNUM, * FROM (subquery)
 </li><li>Clustering: reads should be randomly distributed or to a designated database on RAM
 </li><li>Clustering: when a database is back alive, automatically synchronize with the master
+</li><li>File system that writes to two file systems (replication, replicating file system)
 </li><li>Optimizer: use an index for IS NULL and IS NOT NULL (including linked tables).
     ID IS NOT NULL could be converted to ID &gt;= Integer.MIN_VALUE.
 </li><li>Standalone tool to get relevant system properties and add it to the trace output.
@@ -147,7 +146,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>JAMon (proxy jdbc driver)
 </li><li>Console: improve editing data (Tab, Shift-Tab, Enter, Up, Down, Shift+Del?)
 </li><li>Console: autocomplete Ctrl+Space inserts template
-</li><li>Simplify translation ('Donate a translation')
 </li><li>Option to encrypt .trace.db file
 </li><li>Write Behind Cache on SATA leads to data corruption See also http://sr5tech.com/write_back_cache_experiments.htm and http://www.jasonbrome.com/blog/archives/2004/04/03/writecache_enabled.html
 </li><li>Functions with unknown return or parameter data types: serialize / deserialize
@@ -261,7 +259,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Optimize SELECT MIN(ID), MAX(ID), COUNT(*) FROM TEST WHERE ID BETWEEN 100 AND 200
 </li><li>Sequence: PostgreSQL compatibility (rename, create) (http://www.postgresql.org/docs/8.2/static/sql-altersequence.html)
 </li><li>DISTINCT: support large result sets by sorting on all columns (additionally) and then removing duplicates.
-</li><li>File system that writes to two file systems (replicating file system)
 </li><li>File system with a background writer thread; test if this is faster
 </li><li>Better document the source code
 </li><li>Support select * from dual a left join dual b on b.x=(select max(x) from dual)
@@ -464,6 +461,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Issue 132: Use Java enum trigger type.
 </li><li>Issue 134: IBM DB2 compatibility: session global variables.
 </li><li>FTL_SET_OPTION(keyString, valueString) with key stopWords at first.
+</li><li>Pluggable access control mechanism.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/test/org/h2/test/todo/createFunction.txt

+CREATE FUNCTION name ( argName ] type [ { DEFAULT | = } defaultExpression ] [, ...] ] )
+[ RETURNS type ]
+{ LANGUAGE languageName | IMMUTABLE | STABLE
+| VOLATILE | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT
+| STRICT | COST executionCost | ROWS resultRows
+
+IMMUTABLE cannot modify the database and always returns the same result
+
+STABLE cannot modify the database and within a single table scan it will consistently
+return the same result
+
+VOLATILE value can change
+
+CALLED ON NULL INPUT
+RETURNS NULL ON NULL INPUT or STRICT

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

@@ -617,4 +617,4 @@ scrambling distinguish official unofficial distinguishable overwrites lastval
 notranslate vince bonfanti alphabetically sysdummy sysibm activation
 deactivation concatenating reproducing black railroads railroad radius moz
 imageio argb bilinear rendering stroke interpolation flip diagrams draw
-delim overlap subselect bitwise dclassifier dgenerate
+delim overlap subselect bitwise dclassifier dgenerate compacts chartrand phane