--no commit message

--no commit message

h2/src/docsrc/help/help.csv

@@ -391,7 +391,9 @@ FOR classAndMethodName
 Creates a new function alias. The method name must be the full qualified class
 and method name, and may optionally include the parameter classes as in
 ""java.lang.Integer.parseInt(java.lang.String, int)""). The class and the method
-must both be public, and the method must be static.
+must both be public, and the method must be static. The class must be available
+in the classpath of the database engine (when using the server mode, 
+it must be in the classpath of the server).
 
 Deterministic functions always return the same value for the same parameters.
 If the first parameter of the Java function is a java.sql.Connection, then a
@@ -541,9 +543,11 @@ ON tableName
 CALL triggeredClassName
 ","
 Creates a new trigger. The trigger class must be public. Nested and inner
-classes are not supported. Before triggers are called after data conversion is
-made, default values are set, null and length constraint checks have been made;
-but before other constraints have been checked.
+classes are not supported.  The class must be available in the classpath of the 
+database engine (when using the server mode, it must be in the classpath of the server).
+
+Before triggers are called after data conversion is made, default values are set, 
+null and length constraint checks have been made; but before other constraints have been checked.
 
 This command commits an open transaction.
 ","

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>New committer: Christian Peter. He works for <a href="http://www.docware.com">Docware</a> and
+<ul><li>New system property h2.nullConcatIsNull to change the default null concatenation behavior.
+    The default will be enabled in version 1.2.
+</li><li>The cache algorithm TQ is disabled in this version, because it is unstable, and
+    because the current implementation does not have any measurable advantages over the default.
+</li><li>New committer: Christian Peter. He works for <a href="http://www.docware.com">Docware</a> and
     helped a lot finding and fixing bugs, and generally improving the database. He is now a committer.
 </li><li>ChangeFileEncryption did not work with Lob subdirectories. Fixed.
 </li><li>Issue 121: JaQu: new simple update and merge methods.

h2/src/docsrc/html/roadmap.html

@@ -23,8 +23,9 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </p>
 
 <h2>Version 1.2</h2>
-<ul><li>Enable system property h2.optimizeInList by default.
-</li><li>Enable Mode.nullConcatIsNull by default, and use a system property.
+<ul><li>Enable the system property h2.optimizeInList by default.
+</li><li>Enable the system property h2.nullConcatIsNull by default.
+</li><li>Enable the system property h2.pageStore by default.
 </li></ul>
 
 <h2>Priority 1</h2>
@@ -455,6 +456,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Add option to enable TCP_NODELAY using Socket.setTcpNoDelay(true).
 </li><li>Maybe disallow = within database names (jdbc:h2:mem:MODE=DB2 means database name MODE=DB2).
 </li><li>Fast alter table add column.
+</li><li>Improve concurrency for in-memory database operations.
 </li></ul>
 
 <h2>Not Planned</h2>