--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,10 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The fulltext search documentation has been improved.
+<ul><li>Deleting a database using the tool DeleteDbFiles deleted LOB files
+    of other databases in the same directory.
+</li><li>When used in a subquery, LIKE and IN(..) did not work correctly sometimes.
+</li><li>The fulltext search documentation has been improved.
 </li><li>ARRAY_GET returned the wrong data type (ARRAY). Now it returns VARCHAR.
 </li><li>Natural join: the joined columns are not repeated any more when using SELECT *.
 </li><li>User defined aggregate functions: the method getType expected internal data types

h2/src/docsrc/html/jaqu.html

@@ -271,11 +271,14 @@ Some ideas for what to implement include:
 
 <h2>Related Projects</h2>
 <p>
-<a href="http://www.jequel.de/">JEQUEL: Java Embedded QUEry Language</a><br />
-<a href="http://quaere.codehaus.org/">Quaere</a><br />
+<a href="http://incubator.apache.org/empire-db/empiredb/empiredb.htm">Empire-db</a><br />
+<a href="http://www.jequel.de">JEQUEL: Java Embedded QUEry Language</a><br />
+<a href="http://josql.sourceforge.net">JoSQL</a><br />
+<a href="http://code.google.com/p/liquidform">LIQUidFORM</a><br />
 <a href="http://svn.quaere.codehaus.org/browse/~raw,r=76/quaere/trunk/Quaere/src/test/java/org/quaere/alias/test/SamplesTest.java">Quaere (Alias implementation)</a><br />
-<a href="http://josql.sourceforge.net/">JoSQL</a><br />
-<a href="http://groups.google.de/group/jlinq">Google Group about adding LINQ features to Java</a><br />
+<a href="http://quaere.codehaus.org/">Quaere</a><br />
+<a href="http://source.mysema.com/display/querydsl/Querydsl">Querydsl</a><br />
+<a href="https://squill.dev.java.net">Squill</a><br />
 </p>
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>

h2/src/main/org/h2/jdbc/JdbcStatement.java

@@ -662,7 +662,8 @@ public class JdbcStatement extends TraceObject implements Statement {
      * Move to the next result set.
      * This method always returns false.
      *
-     * @param current Statement.CLOSE_CURRENT_RESULT, Statement.KEEP_CURRENT_RESULT
+     * @param current Statement.CLOSE_CURRENT_RESULT,
+     *          Statement.KEEP_CURRENT_RESULT,
      *          or Statement.CLOSE_ALL_RESULTS
      * @return false
      */
@@ -672,7 +673,9 @@ public class JdbcStatement extends TraceObject implements Statement {
             switch (current) {
             case Statement.CLOSE_CURRENT_RESULT:
             case Statement.CLOSE_ALL_RESULTS:
+                if (resultSet != null) {
                     resultSet.close();
+                }
                 break;
             case Statement.KEEP_CURRENT_RESULT:
                 // nothing to do

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

@@ -283,7 +283,6 @@ java org.h2.test.TestAll timer
         System.setProperty("h2.check2", "true");
 
 /*
-javadocs: check if there is a desc for a param, return...
 JCR: for each node type, create a table; one 'dynamic' table with parameter;
     option to cache the results
 <link rel="icon" type="image/png" href="/path/image.png">

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

@@ -574,4 +574,4 @@ statisticlog activeobjects manske redeployment michael kaspersky datatext
 bleyl donald conservative offsets diabetes ansorg allocating osmond gluco
 joachim mysqladmin sudo mysqld indicator wire ring relates expedites
 approximated approximation dvan dsn dobysoft ebean syswow tmueller dbbench
-connecturl problematic transformation lazy
+connecturl problematic transformation lazy querydsl squill empire liq
\ No newline at end of file