--no commit message

--no commit message

h2/src/docsrc/html/features.html

@@ -642,7 +642,7 @@ and the file password (in addition to the user password) when connecting to the
 
 <h3>Creating a New Database with File Encryption</h3>
 <p>
-By default, a new database is automatically created if it does not exist yet. 
+By default, a new database is automatically created if it does not exist yet.
 To create an encrypted database, connect to it as it would already exist.
 </p>
 
@@ -665,9 +665,9 @@ conn = DriverManager.
 
 <h3>Encrypting or Decrypting a Database</h3>
 <p>
-If you want to encrypt an existing database, use the ChangeFileEncryption tool. 
-This tool can also decrypt an encrypted database, or change the file encryption key. 
-It is available from within the H2 Console in the Tools section, or you can run it from the command line. 
+If you want to encrypt an existing database, use the ChangeFileEncryption tool.
+This tool can also decrypt an encrypted database, or change the file encryption key.
+It is available from within the H2 Console in the Tools section, or you can run it from the command line.
 The following command line will encrypt the database 'test' in the user home directory
 with the file password 'filepwd' and the encryption algorithm AES:
 </p>
@@ -1161,12 +1161,12 @@ contains all client side state that is re-created.
 <br /><a name="auto_mixed_mode"></a>
 <h2>Automatic Mixed Mode</h2>
 <p>
-Multiple processes can access the same database without having to start the server manually. 
+Multiple processes can access the same database without having to start the server manually.
 To do that, append <code>;AUTO_SERVER=TRUE</code> to the database URL.
 You can use the same database URL no matter if the database is already open or not.
 </p>
 <p>
-When using this mode, the first connection to the database is made in embedded mode, 
+When using this mode, the first connection to the database is made in embedded mode,
 and additionally a server is started internally.
 If the database is already open in another process, the server mode is used automatically.
 </p>
@@ -1181,7 +1181,7 @@ open, one of them will then start a server (auto-reconnect is enabled automatica
 </p>
 <p>
 This mode has two disadvantages: All processes need to have access to the database files.
-Then, if the first connection is closed (the connection that started the server), open transactions of 
+Then, if the first connection is closed (the connection that started the server), open transactions of
 other connections will be rolled back.
 </p>
 

h2/src/docsrc/html/roadmap.html

@@ -380,6 +380,7 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>Delete temporary files or objects using finalize.
 </li><li>Oracle compatibility: support calling 0-parameters functions without parenthesis. Make constants obsolete.
 </li><li>MySQL, HSQLDB compatibility: support where 'a'=1 (not supported by Derby, PostgreSQL)
+</li><li>Allow calling function with no parameters without parenthesis. See http://code.google.com/p/h2database/issues/detail?id=50
 </li><li>CSV: currently # is a line comment and can start at any field. Make it optional.
 </li><li>Add database creation date and time to the database.
 </li><li>Support ASSERTIONS.
@@ -401,6 +402,9 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>Doclet: convert tests in javadocs to a java class.
 </li><li>Doclet: format fields like methods, but support sorting by name and value.
 </li><li>Doclet: shrink the html files.
+</li><li>Finer granularity for SLF4J trace - See http://code.google.com/p/h2database/issues/detail?id=62
+</li><li>MySQL compatibility: support REPLACE - See http://code.google.com/p/h2database/issues/detail?id=73
+</li><li>MySQL compatibility: support SET NAMES 'latin1' - See also http://code.google.com/p/h2database/issues/detail?id=56
 </li></ul>
 
 <h2>Not Planned</h2>

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

@@ -328,7 +328,7 @@ public class Shell extends Tool {
 
     /**
      * Print the string without newline, and flush.
-     * 
+     *
      * @param s the string to print
      */
     protected void print(String s) {
@@ -352,7 +352,7 @@ public class Shell extends Tool {
         } catch (Exception e) {
             // ignore, use the default solution
         }
-        
+
         /**
          * This thread hides the password by repeatedly printing
          * backspace, backspace, >, <.

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

@@ -584,4 +584,4 @@ grails reloading slightly accepting deploying conflicting recovered counters
 versus extracts squirrel misdirected rle looking arc addressed european
 soerensen favicon glass restarts flexive fish resulted vpda mvc kotek jan
 consistently springfuse grep signatures wrote symbolic parents caches readers
-animate scaladoc models
\ No newline at end of file
+animate scaladoc models disadvantages vladykin sergi
\ No newline at end of file