Index: mysql-connector-java-3.1.10/src/com/mysql/jdbc/NonRegisteringDriver.java
===================================================================
--- mysql-connector-java-3.1.10.orig/src/com/mysql/jdbc/NonRegisteringDriver.java	2005-08-23 12:35:40.000000000 +0200
+++ mysql-connector-java-3.1.10/src/com/mysql/jdbc/NonRegisteringDriver.java	2005-08-23 12:42:52.000000000 +0200
@@ -456,21 +456,12 @@
 			StringTokenizer queryParams = new StringTokenizer(paramString, "&"); //$NON-NLS-1$
 
 			while (queryParams.hasMoreTokens()) {
-				StringTokenizer vp = new StringTokenizer(queryParams
-						.nextToken(), "="); //$NON-NLS-1$
-				String param = ""; //$NON-NLS-1$
-
-				if (vp.hasMoreTokens()) {
-					param = vp.nextToken();
-				}
-
-				String value = ""; //$NON-NLS-1$
-
-				if (vp.hasMoreTokens()) {
-					value = vp.nextToken();
-				}
-
-				if ((value.length() > 0) && (param.length() > 0)) {
+				String token = queryParams.nextToken();
+				int eqPos = token.indexOf('=');
+				if (eqPos > 0 && eqPos + 1 < token.length()) {
+					// there are chars before and after '='
+					String param = token.substring(0, eqPos); //$NON-NLS-1$
+					String value = token.substring(eqPos + 1); //$NON-NLS-1$
 					urlProps.put(param, value);
 				}
 			}