Merge remote-tracking branch 'upstream/master' into testing_pagestore

h2/src/main/org/h2/server/TcpServerThread.java

@@ -89,13 +89,17 @@ public class TcpServerThread implements Runnable {
                     throw DbException.get(ErrorCode.REMOTE_CONNECTION_NOT_ALLOWED);
                 }
                 int minClientVersion = transfer.readInt();
+                if (minClientVersion < 6) {
+                    throw DbException.get(ErrorCode.DRIVER_VERSION_ERROR_2,
+                            "" + minClientVersion, "" + Constants.TCP_PROTOCOL_VERSION_MIN_SUPPORTED);
+                }
                 int maxClientVersion = transfer.readInt();
                 if (maxClientVersion < Constants.TCP_PROTOCOL_VERSION_MIN_SUPPORTED) {
                     throw DbException.get(ErrorCode.DRIVER_VERSION_ERROR_2,
-                            "" + clientVersion, "" + Constants.TCP_PROTOCOL_VERSION_MIN_SUPPORTED);
+                            "" + maxClientVersion, "" + Constants.TCP_PROTOCOL_VERSION_MIN_SUPPORTED);
                 } else if (minClientVersion > Constants.TCP_PROTOCOL_VERSION_MAX_SUPPORTED) {
                     throw DbException.get(ErrorCode.DRIVER_VERSION_ERROR_2,
-                            "" + clientVersion, "" + Constants.TCP_PROTOCOL_VERSION_MAX_SUPPORTED);
+                            "" + minClientVersion, "" + Constants.TCP_PROTOCOL_VERSION_MAX_SUPPORTED);
                 }
                 if (maxClientVersion >= Constants.TCP_PROTOCOL_VERSION_MAX_SUPPORTED) {
                     clientVersion = Constants.TCP_PROTOCOL_VERSION_MAX_SUPPORTED;

h2/src/test/org/h2/test/unit/TestOldVersion.java

@@ -144,7 +144,14 @@ public class TestOldVersion extends TestBase {
 
     private static ClassLoader getClassLoader(String jarFile) throws Exception {
         URL[] urls = { new URL(jarFile) };
-        return new URLClassLoader(urls, null);
+        return new URLClassLoader(urls, null) {
+            @Override
+            protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                if (name.startsWith("org.h2."))
+                    return super.loadClass(name, resolve);
+                return TestOldVersion.class.getClassLoader().loadClass(name);
+            }
+        };
     }
 
     private static Driver getDriver(ClassLoader cl) throws Exception {