--no commit message

--no commit message

h2/src/main/org/h2/engine/Constants.java

@@ -117,7 +117,7 @@ public class Constants {
     /**
      * The minor version of this product.
      */
-    public static final int VERSION_MINOR = 1;
+    public static final int VERSION_MINOR = 0;
 
     /**
      * The version number (major.minor) of this product.

h2/src/test/org/h2/test/bench/TestPerformance.java

@@ -10,6 +10,7 @@ import java.io.FileWriter;
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -226,6 +227,8 @@ public class TestPerformance {
             System.out.println("Testing the performance of " + db.getName());
             db.startServer();
             Connection conn = db.openNewConnection();
+            DatabaseMetaData meta = conn.getMetaData();
+            System.out.println(" " + meta.getDatabaseProductName() + " " + meta.getDatabaseProductVersion());
             runDatabase(db, tests, 1);
             runDatabase(db, tests, 1);
             collect = true;

h2/src/test/org/h2/test/bench/test.properties

@@ -7,14 +7,20 @@ db1 = H2, org.h2.Driver, jdbc:h2:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, s
 #xdb5 = H2_PG, org.postgresql.Driver, jdbc:postgresql://localhost:5435/h2test, sa, sa
 
 db2 = HSQLDB, org.hsqldb.jdbcDriver, jdbc:hsqldb:data/test;hsqldb.default_table_type=cached;sql.enforce_size=true, sa
-db3 = Derby, org.apache.derby.jdbc.EmbeddedDriver, jdbc:derby:data/test;create=true, sa, sa
+db3 = Derby, org.apache.derby.jdbc.EmbeddedDriver, jdbc:derby:data/derby;create=true, sa, sa
 
 db4 = H2, org.h2.Driver, jdbc:h2:tcp://localhost/data/testServer;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
 db5 = HSQLDB, org.hsqldb.jdbcDriver, jdbc:hsqldb:hsql://localhost/xdb, sa
-db6 = Derby, org.apache.derby.jdbc.ClientDriver, jdbc:derby://localhost/data/testServer;create=true, sa, sa
+db6 = Derby, org.apache.derby.jdbc.ClientDriver, jdbc:derby://localhost/data/derbyServer;create=true, sa, sa
 db7 = PostgreSQL, org.postgresql.Driver, jdbc:postgresql:test, sa, sa
 db8 = MySQL, com.mysql.jdbc.Driver, jdbc:mysql://localhost/test?jdbcCompliantTruncation=false, sa, sa
 
+# MySQL configuration:
+# create database test;
+# create user sa identified by 'sa';
+# use test;
+# grant all on * to sa with grant option;
+
 #db2 = MSSQLServer, com.microsoft.jdbc.sqlserver.SQLServerDriver, jdbc:microsoft:sqlserver://127.0.0.1:1433;DatabaseName=test, test, test
 #db2 = Oracle, oracle.jdbc.driver.OracleDriver, jdbc:oracle:thin:@localhost:1521:XE, client, client
 #db2 = Firebird, org.firebirdsql.jdbc.FBDriver, jdbc:firebirdsql:localhost:c:/temp/firebird/test, sysdba, masterkey

h2/src/tools/org/h2/build/Build.java

@@ -32,13 +32,13 @@ public class Build extends BuildBase {
         download("ext/hsqldb-1.8.0.7.jar",
                 "http://repo1.maven.org/maven2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar",
                 "20554954120b3cc9f08804524ec90113a73f3015");
-        download("ext/derby-10.4.1.3.jar",
+        download("ext/derby-10.4.2.0.jar",
                 "http://repo1.maven.org/maven2/org/apache/derby/derby/10.4.2.0/derby-10.4.2.0.jar",
                 "e785a7c453056a842826d98e6a780724f9b7abf8");
-        download("ext/derbyclient-10.4.1.3.jar",
+        download("ext/derbyclient-10.4.2.0.jar",
                 "http://repo1.maven.org/maven2/org/apache/derby/derbyclient/10.4.2.0/derbyclient-10.4.2.0.jar",
                 "b3452b5e026e418462fd5464bb7571c7ff1ee8a5");
-        download("ext/derbynet-10.4.1.3.jar",
+        download("ext/derbynet-10.4.2.0.jar",
                 "http://repo1.maven.org/maven2/org/apache/derby/derbynet/10.4.2.0/derbynet-10.4.2.0.jar",
                 "1547800a688132a7602d5dc280bfe88bb085bfde");
         download("ext/postgresql-8.3-603.jdbc3.jar",
@@ -48,6 +48,7 @@ public class Build extends BuildBase {
                 "http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar", 
                 "380ef5226de2c85ff3b38cbfefeea881c5fce09d");
         String cp = "temp" + File.pathSeparator + "bin/h2" + getJarSuffix() + File.pathSeparator +
+        "ext/hsqldb.jar" + File.pathSeparator +
         "ext/hsqldb-1.8.0.7.jar" + File.pathSeparator +
         "ext/derby-10.4.2.0.jar" + File.pathSeparator +
         "ext/derbyclient-10.4.2.0.jar" + File.pathSeparator +