--no commit message

--no commit message

--no commit message
81c34acc · Thomas Mueller · 9030e8e7 · 81c34acc · 81c34acc · 81c34acc
--- a/h2/src/docsrc/html/advanced.html
+++ b/h2/src/docsrc/html/advanced.html
--- a/h2/src/docsrc/html/features.html
+++ b/h2/src/docsrc/html/features.html
--- a/h2/src/docsrc/html/frame.html
+++ b/h2/src/docsrc/html/frame.html
@@ -18,12 +18,14 @@ Initial Developer: H2 Group
 </frameset>
 <noframes>
 <body>
+<p>
 H2 (for 'Hypersonic 2') is free a Java SQL DBMS.
 Clustering, embedded and server mode, transactions, referential integrity, 
 views, subqueries, triggers, encryption, and disk based or in-memory operation 
 are supported. A browser based console application is included. 
 If you see this page your browser does not support frames. 
 Please click here to view the <a href="search.html">index</a>.
+</p>
 </body>
 </noframes>
 </html>
--- a/h2/src/docsrc/html/frame_ja.html
+++ b/h2/src/docsrc/html/frame_ja.html
@@ -18,12 +18,14 @@ Initial Developer: H2 Group
 </frameset>
 <noframes>
 <body>
+<p>
 H2 (for 'Hypersonic 2') is free a Java SQL DBMS.
 Clustering, embedded and server mode, transactions, referential integrity, 
 views, subqueries, triggers, encryption, and disk based or in-memory operation 
 are supported. A browser based console application is included. 
 If you see this page your browser does not support frames. 
 Please click here to view the <a href="search_ja.html">index</a>.
+</p>
 </body>
 </noframes>
 </html>
--- a/h2/src/docsrc/html/history.html
+++ b/h2/src/docsrc/html/history.html
@@ -1092,6 +1092,7 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
 </li><li>Automatic mode: jdbc:h2:auto: (embedded mode if possible, if not use server mode). 
    Problem: what to do when server stops while others are connected to it.
 </li><li>Access rights: remember the owner of an object. COMMENT: allow owner of object to change it.
+</li><li>Implement INSTEAD OF trigger.
 </li></ul>

 <h3>Not Planned</h3>

--- a/h2/src/docsrc/html/main_ja.html
+++ b/h2/src/docsrc/html/main_ja.html
@@ -4,7 +4,7 @@
 Copyright 2004-2006 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). 
 Initial Developer: H2 Group
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
 <head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title>
 H2 Database Engine
 </title><link rel="stylesheet" type="text/css" href="stylesheet.css" />

--- a/h2/src/docsrc/html/performance.html
+++ b/h2/src/docsrc/html/performance.html
--- a/h2/src/main/org/h2/jdbc/JdbcSQLException.java
+++ b/h2/src/main/org/h2/jdbc/JdbcSQLException.java
@@ -40,6 +40,9 @@ public class JdbcSQLException extends SQLException {
    }
    
    private static String buildMessage(String message, String sql, String state) {
+        if(message == null) {
+            message = "";
+        }
        StringBuffer buff = new StringBuffer(message);
        if(sql != null) {
            buff.append("; SQL statement: ");

--- a/h2/src/test/org/h2/test/TestAll.java
+++ b/h2/src/test/org/h2/test/TestAll.java
@@ -4,7 +4,10 @@
 */
 package org.h2.test;

+import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Properties;

 import org.h2.server.TcpServer;
@@ -94,6 +97,23 @@ java -Xmx512m -Xrunhprof:cpu=samples,depth=8 org.h2.tools.RunScript -url jdbc:h2

 /*

+search from a frame (but usually don't use frames)
+
+        Class.forName("org.h2.Driver");
+        DeleteDbFiles.execute("~", null, true);
+        Connection conn1 = DriverManager.getConnection("jdbc:h2:~/test");
+        Statement s1 = conn1.createStatement();
+        s1.execute("create table test(id int)");
+        conn1.setAutoCommit(false);
+        s1.execute("delete from test");
+        s1.execute("PREPARE COMMIT TX_8");
+        s1.execute("COMMIT TRANSACTION TX_8");
+        Connection conn2 = DriverManager.getConnection("jdbc:h2:~/test");
+        conn2.createStatement().execute("select * from test");
+        
+        
+call  N'@name';
+
 pg_version is in public instead of pg_catalog

 copyright to include 2007

--- a/h2/src/tools/org/h2/server/web/DbStarter.java
+++ b/h2/src/tools/org/h2/server/web/DbStarter.java
@@ -17,7 +17,7 @@ public class DbStarter implements ServletContextListener {
            // You can also get the setting from a context-param in web.xml:
            ServletContext servletContext = servletContextEvent.getServletContext();
            // String url = servletContext.getInitParameter("db.url");
-            conn = DriverManager.getConnection("jdbc:h2:test", "sa", "");
+            conn = DriverManager.getConnection("jdbc:h2:~/test", "sa", "");
            servletContext.setAttribute("connection", conn);
        } catch (Exception e) {
            e.printStackTrace();