--no commit message

--no commit message

h2/src/docsrc/help/help.csv

@@ -3076,8 +3076,10 @@ ROWNUM(): int
 Returns the number of the current row. This function is supported for SELECT
 statements, as well as for DELETE and UPDATE. The first row has the row number
 1, and is calculated before ordering and grouping the result set.
+To get the row number after ordering and grouping, use a subquery.
 ","
-SELECT ROWNUM(), * FROM TEST
+SELECT ROWNUM(), * FROM TEST;
+SELECT ROWNUM(), * FROM (SELECT * FROM TEST ORDER BY NAME);
 "
 
 "Functions (System)","SCHEMA","

h2/src/docsrc/html/build.html

@@ -185,9 +185,21 @@ If you like to provide patches, please consider the following guidelines to simp
 </li><li>Provide a change log entry (<code>src/docsrc/html/changelog.html</code>).
 </li><li>Verify the spelling using <code>build spellcheck</code>. If required
     add the new words to <code>src/tools/org/h2/build/doc/dictionary.txt</code>.
+</li><li>Run the src/installer/buildRelease to find and fix formatting errors.
 </li><li>Verify the formatting using <code>build docs</code> and <code>build javadoc</code>.
 </li><li>Submit patches as .patch files (compressed if big). To create a patch using Eclipse, use Team / Create Patch.
 </li></ul>
+<p>
+For legal reasons, patches need to be public in the form of an email to the
+<a href="http://groups.google.com/group/h2-database">group</a>, or in the form
+of an <a href="http://code.google.com/p/h2database/issues/list">issue report or attachment</a>.
+Significant contributions need to include the following statement:
+</p>
+<pre>
+"I wrote the code, it's mine, and I'm contributing it to H2 for distribution
+multiple-licensed under the H2 License, version 1.0, and under the
+Eclipse Public License, version 1.0 (http://h2database.com/html/license.html)."
+</pre>
 
 <br /><a name="automated"></a>
 <h2>Automated Build</h2>

h2/src/docsrc/html/jaqu.html

@@ -68,8 +68,8 @@ in the same application is complicated: you would need to split the application
 
 <h2>Current State</h2>
 <p>
-JaQu is not yet stable, and not part of the h2 jar file. However the source code is included in H2,
-under:
+Currently, JaQu is only tested with the H2 database. The API may change in future versions.
+JaQu is not part of the h2 jar file, however the source code is included in H2, under:
 </p>
 <ul><li>src/test/org/h2/test/jaqu/* (samples and tests)
 </li><li>src/tools/org/h2/jaqu/* (framework)

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

@@ -980,15 +980,15 @@ ASCII(string): int
 ","
 Returns the ASCII value of the first character in the string."
 "Functions (String)","BIT_LENGTH","
-BIT_LENGTH(string): int
+BIT_LENGTH(string): long
 ","
 Returns the number of bits in a string."
 "Functions (String)","LENGTH","
-{LENGTH | CHAR_LENGTH | CHARACTER_LENGTH}(string): int
+{LENGTH | CHAR_LENGTH | CHARACTER_LENGTH}(string): long
 ","
 Returns the number of characters in a string."
 "Functions (String)","OCTET_LENGTH","
-OCTET_LENGTH(string): int
+OCTET_LENGTH(string): long
 ","
 Returns the number of bytes in a string."
 "Functions (String)","CHAR","

h2/src/main/org/h2/res/javadoc.properties

@@ -7,18 +7,18 @@ org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and
 org.h2.tools.ConvertTraceFile=Converts a .trace.db file to a SQL script and Java source code.\nSQL statement statistics are listed as well.
 org.h2.tools.ConvertTraceFile.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]      Print the list of options\n[-traceFile <file>]  The trace file name (default\: test.trace.db)\n[-script <file>]     The script file name (default\: test.sql)\n[-javaClass <file>]  The Java directory and class file name (default\: Test)
 org.h2.tools.CreateCluster=Creates a cluster from a standalone database.\nCopies a database to another location if required.
-org.h2.tools.CreateCluster.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-urlSource <url>]    The database URL of the source database (jdbc\:h2\:...)\n[-urlTarget <url>]    The database URL of the target database (jdbc\:h2\:...)\n[-user <user>]        The user name (default\: sa)\n[-password <pwd>]     The password\n[-serverList <list>]  The comma separated list of host names or IP addresses
+org.h2.tools.CreateCluster.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-urlSource "<url>"]  The database URL of the source database (jdbc\:h2\:...)\n[-urlTarget "<url>"]  The database URL of the target database (jdbc\:h2\:...)\n[-user <user>]        The user name (default\: sa)\n[-password <pwd>]     The password\n[-serverList <list>]  The comma separated list of host names or IP addresses
 org.h2.tools.DeleteDbFiles=Deletes all files belonging to a database.\nThe database must be closed before calling this tool.
 org.h2.tools.DeleteDbFiles.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name\n[-quiet]          Do not print progress information
 org.h2.tools.Recover=Helps recovering a corrupted database.
-org.h2.tools.Recover.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name (all databases if not set)\n[-trace]          Print additional trace information
+org.h2.tools.Recover.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name (all databases if not set)\n[-trace]          Print additional trace information\nEncrypted databases need to be decrypted first.
 org.h2.tools.Restore=Restores a H2 database by extracting the database files from a .zip file.
 org.h2.tools.Restore.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The source file name (default\: backup.zip)\n[-dir <dir>]        The target directory (default\: .)\n[-db <database>]    The target database name (as stored if not set)\n[-quiet]            Do not print progress information
 org.h2.tools.RunScript=Runs a SQL script against a database.
-org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The script file to run (default\: backup.sql)\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\n[-showResults]     Show the statements and the results of queries\n[-checkResults]    Check if the query results match the expected results\n[-options ...]     RUNSCRIPT options (embedded H2; -*Results not supported)
+org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url "<url>"]     The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The script file to run (default\: backup.sql)\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\n[-showResults]     Show the statements and the results of queries\n[-checkResults]    Check if the query results match the expected results\n[-options ...]     RUNSCRIPT options (embedded H2; -*Results not supported)
 org.h2.tools.Script=Creates a SQL script file by extracting the schema and data of a database.
-org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)\n[-quiet]           Do not print progress information
+org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url "<url>"]     The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)\n[-quiet]           Do not print progress information
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
-org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-web]                Start the web server with the H2 Console\n[-webAllowOthers]     Allow other computers to connect\n[-webPort <port>]     The port (default\: 8082)\n[-webSSL]             Use encrypted (HTTPS) connections\n[-browser]            Start a browser and open a page to connect to the web server\n[-tcp]                Start the TCP server\n[-tcpAllowOthers]     Allow other computers to connect\n[-tcpPort <port>]     The port (default\: 9092)\n[-tcpSSL]             Use encrypted (SSL) connections\n[-tcpPassword <pwd>]  The password for shutting down a TCP server\n[-tcpShutdown <url>]  Stop the TCP server; example\: tcp\://localhost\:9094\n[-tcpShutdownForce]   Do not wait until all connections are closed\n[-pg]                 Start the PG server\n[-pgAllowOthers]      Allow other computers to connect\n[-pgPort <port>]      The port (default\: 5435)\n[-baseDir <dir>]      The base directory for H2 databases; for all servers\n[-ifExists]           Only existing databases may be opened; for all servers\n[-trace]              Print additional trace information; for all servers
+org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-browser]              Start a browser and open a page to connect to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\:9094\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect\n[-pgPort <port>]        The port (default\: 5435)\n[-baseDir <dir>]        The base directory for H2 databases; for all servers\n[-ifExists]             Only existing databases may be opened; for all servers\n[-trace]                Print additional trace information; for all servers
 org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
-org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).
+org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url "<url>"]     The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).

h2/src/test/org/h2/test/TestAll.java

@@ -298,8 +298,10 @@ java org.h2.test.TestAll timer
 better document that ddl statements commit
 "This command commits an open transaction."
 PostgreSQL compatibility: 2001-02-03 08:20:31+01 (:minutes optional)
-Support Java 6 DatabaseMetaData.getColumns, getProcedures, getProcedureColumns, getTables.
+Support Java 6 DatabaseMetaData.getColumns, getProcedures,
+getProcedureColumns, getTables.
 MySQL compatibility for "show columns from test"
+RollbackTest
 
 -------------
 

h2/src/test/org/h2/test/db/TestMultiThreadedKernel.java

@@ -16,7 +16,15 @@ import org.h2.util.JdbcUtils;
  * A multi-threaded test case.
  */
 public class TestMultiThreadedKernel extends TestBase {
+
+    /**
+     * Stop the current thread.
+     */
     volatile boolean stop;
+
+    /**
+     * The exception that occurred in the thread.
+     */
     Exception exception;
 
     /**

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

@@ -595,4 +595,5 @@ attachment transiently cleanup dbsnmp olapsys wmsys tsmsys outln ctxsys mddata
 ordsys ordplugins mgmt dmsys exfsys mdsys sysman informtn textarray tmzone cdo
 emf decompile streamed setmaxlengthinplacelob setcompresslob compressing
 compressible subclass ints seeks kilobytes capitalized sqlj psm sigmod acm
-shrinking bsdiff
+shrinking bsdiff toward markets hispanic rad dinamica treat contributing
\ No newline at end of file
+fraction
\ No newline at end of file

h2/src/tools/org/h2/dev/ftp/server/FtpServer.java

@@ -115,7 +115,7 @@ public class FtpServer extends Tool implements Service {
      * <td>Use encrypted (SSL) connections</td></tr>
      * <tr><td>[-tcpPassword &lt;pwd&gt;]</td>
      * <td>The password for shutting down a TCP server</td></tr>
-     * <tr><td>[-tcpShutdown &lt;url&gt;]</td>
+     * <tr><td>[-tcpShutdown "&lt;url&gt;"]</td>
      * <td>Stop the TCP server; example: tcp://localhost:9094</td></tr>
      * <tr><td>[-tcpShutdownForce]</td>
      * <td>Do not wait until all connections are closed</td></tr>