diff -urN mysql-connector-java-5.0-nightly-20060807/src/com/mysql/jdbc/StandardSocketFactory.java mysql-connector-java-5.0-nightly-20060807-patched/src/com/mysql/jdbc/StandardSocketFactory.java
--- mysql-connector-java-5.0-nightly-20060807/src/com/mysql/jdbc/StandardSocketFactory.java	2006-08-07 02:01:50.000000000 +0200
+++ mysql-connector-java-5.0-nightly-20060807-patched/src/com/mysql/jdbc/StandardSocketFactory.java	2006-08-07 14:40:14.000000000 +0200
@@ -195,6 +195,11 @@
 						}
 
 						if (rawSocket == null) {
+							Throwable cause = caughtWhileConnecting.getCause();
+							if (cause instanceof SocketException ||
+									cause instanceof SocketTimeoutException) {
+								throw cause;
+							}
 							throw new SocketException(caughtWhileConnecting
 									.toString());
 						}