--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,14 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The functions BITOR, BITAND, BITXOR, and MOD now accept 
+<ul><li>Multiple nested queries in the FROM clause with parameters did not always work.
+</li><li>When converting CLOB to BINARY, each character resulted in one byte.
+    Now, the text is parsed as a hex as when converting VARCHAR.
+</li><li>New experimental NIO storage mechanism with both FileChannel and
+    memory mapped files. To use it, prepend nio: or nioMapped: to the file name.
+    Example: jdbc:h2:nio:~/test. So far it looks like NIO storage is faster Mac OS 
+    but slower on some Windows systems. Thanks a lot to Jan Kotek for the patch!
+</li><li>The functions BITOR, BITAND, BITXOR, and MOD now accept 
     and return BIGINT instead of INT.
 </li><li>Could not use the same linked table multiple times in the same query.
 </li><li>A bug in the server-less multi-connection mode has been fixed.

h2/src/docsrc/html/links.html

@@ -519,6 +519,11 @@ Social Bookmarks Friend Finder</a><br />
 A GUI application that allows you to find users with similar bookmarks to the user specified (for delicious.com).
 </p>
 
+<p><a href="http://www.springfuse.com">
+Springfuse</a><br />
+Code generation For Spring, Spring MVC & Hibernate.
+</p>
+
 <p><a href="http://sqlorm.sourceforge.net/index.html">
 SQLOrm</a><br />
 Java Object Relation Mapping.
@@ -554,6 +559,12 @@ Werkzeugkasten</a><br />
 Minimum Java Toolset.
 </p>
 
+<p><a href="http://www.vpda.org">
+VPDA</a><br />
+View providers driven applications is a Java based application framework 
+for building applications composed from server components - view providers.
+</p>
+
 <p><a href="http://sourceforge.net/projects/volunteerbase">
 Volunteer database</a><br />
 A database front end to register volunteers, partnership and donation for a Non Profit organization.

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

@@ -1265,6 +1265,7 @@ public class JdbcConnection extends TraceObject implements Connection {
         }
         if (session.isReconnectNeeded()) {
             trace.debug("reconnect");
+            int todoInvalidatePreparedStatements;
             session = session.reconnect();
             trace = session.getTrace();
             setTrace(trace, TraceObject.CONNECTION, getTraceId());

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

@@ -283,6 +283,9 @@ java org.h2.test.TestAll timer
 
 /*
 
+FILE_LOCK=SERIALIZED with prepared statement, statement,
+maybe updatable result set
+
 mark 1.1 as stable
 
 documentation: start rolling review; consistently use <code> or not.

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

@@ -48,7 +48,7 @@ Please provide any additional information below.
 
 Corrupted database
 
-I am sorry to say that, but it looks like a corruption problem. I am very interested in analyzing and solving this problem. Corruption problems have top priority for me. I have a few question:
+I am sorry to say that, but it looks like a corruption problem. I am very interested in analyzing and solving this problem. Corruption problems have top priority for me. I have a few questions:
 
 - Could you send the full stack trace of the exception including message text?
 - What is your database URL?