.classpath

@@ -6,12 +6,10 @@
 			<attribute name="javadoc_location" value="http://java.sun.com/j2se/1.5.0/docs/api/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="src/lib-nodist/fscontext.jar"/>
-	<classpathentry kind="lib" path="src/lib-nodist/providerutil.jar"/>
 	<classpathentry kind="lib" path="src/lib/jboss-common-jdbc-wrapper.jar"/>
 	<classpathentry kind="lib" path="src/lib/c3p0-0.9.1-pre6.jar"/>
 	<classpathentry kind="lib" path="src/lib/slf4j-api-1.6.1.jar"/>
-	<classpathentry kind="lib" path="src/lib-nodist/junit-3.8.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/MySQL ConnectorJ Extra Libraries"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGES

@@ -1,5 +1,19 @@
 # Changelog
 # $Id$
+02-10-14 - Version 5.1.29
+
+  - Fix for Bug#70701 (17647584), DatabaseMetaData.getSQLKeywords() doesn't match MySQL 5.6 reserved words.
+
+  - Fix for Bug#17435879, REMOVE SRC/LIB-NODIST DIRECTORY FROM LAUNCHPAD DISTRIBUTION.
+    Additional "com.mysql.jdbc.extra.libs" parameter must be used for ant build.
+
+  - Fix for Bug#71038, Add an option for custom collations detection.
+    Added new connection property detectCustomCollations=[true|false], with default false.
+    Please be aware that these changed the previous default behavior and if you use custom charsets or collations
+    you need to set detectCustomCollations=true.
+
+  - Added tests for new index renaming syntax introduced in 5.7.1.
+
 12-23-13 - Version 5.1.28
 
   - Fix for Bug#69579, DriverManager.setLoginTimeout not honored.

build.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!--
-  Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 
   The MySQL Connector/J is licensed under the terms of the GPLv2
   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
@@ -30,7 +30,7 @@
 
 	<property name="major_version" value="5"/>
 	<property name="minor_version" value="1"/>
-	<property name="subminor_version" value="28"/>
+	<property name="subminor_version" value="29"/>
 	<property name="version_status" value=""/>
 
 	<property name="version" value="${major_version}.${minor_version}.${subminor_version}${version_status}"/>
@@ -85,9 +85,16 @@
 
 	<property name="com.mysql.jdbc.docs.sourceDir" value="/home/mmatthew/work/docs/prebuilt"/>
 
+	<!-- 
+	     The following property allows to point the location of third-party libraries
+	     we don't distribute. Default value points to src/lib so user could either put
+	     these jars there or pass different location via ant -D switch. 
+	-->
+	<property name="com.mysql.jdbc.extra.libs" value="${sourceDir}/lib"/>
+
 	<taskdef resource="net/sf/antcontrib/antlib.xml">
 		<classpath>
-			<fileset dir="${sourceDir}/lib-nodist" erroronmissingdir="false">
+			<fileset dir="${com.mysql.jdbc.extra.libs}" erroronmissingdir="false">
 				<include name="**/*.jar"/>
 			</fileset>
 			<fileset dir="${sourceDir}/lib">
@@ -101,7 +108,7 @@
 	</path>
 
 	<path id="project.build.classpath">
-		<fileset dir="${buildDir}/${fullProdName}/lib-nodist">
+		<fileset dir="${com.mysql.jdbc.extra.libs}">
 			<include name="**/*.jar"/>
 		</fileset>
 
@@ -146,8 +153,6 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
              can't dynamically alter the classpath, and not having this
 		     directory present causes the build to fail -->
 
-		<mkdir dir="${buildDir}/${fullProdName}/lib-nodist" />
-
 		<available file="${com.mysql.jdbc.docs.sourceDir}" property="com.mysql.jdbc.docs.sourcesPresent" />
 
 		<available classname="com.mchange.v2.c3p0.QueryConnectionTester" 
@@ -256,7 +261,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 	</target>
 
 	<target name="-init-no-crypto" depends="-init-copy" if="com.mysql.jdbc.noCryptoBuild">
-		<copy file="${sourceDir}/lib-nodist/ExportControlledNoCrypto.notjava"
+		<copy file="${com.mysql.jdbc.extra.libs}/ExportControlledNoCrypto.notjava"
 			toFile="${buildDir}/${fullProdName}/com/mysql/jdbc/ExportControlled.java"
 			overwrite="true"/>
 	</target>
@@ -365,7 +370,6 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<exclude name="**/*.nb*"/>
 			<exclude name="**/*.bak"/>
 			<exclude name="**/*.*~"/>
-			<exclude name="**/lib-nodist/*"/>
 			<exclude name="**/lib-coverage/*"/>
 			<exclude name="**/clover/*"/>
 			<exclude name="**/checkstyle/*"/>
@@ -387,7 +391,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 		<if>
 			<isset property="com.mysql.jdbc.commercialBuild"/>
 			<then>
-				<copy file="${sourceDir}/lib-nodist/README-commercial" tofile="${packageDest}/README.txt" filtering="true">
+				<copy file="${com.mysql.jdbc.extra.libs}/README-commercial" tofile="${packageDest}/README.txt" filtering="true">
 					<filterset refid="versionFilterset" />
 					<filterset refid="licenseFilterset" />
 				</copy>
@@ -417,7 +421,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<isset property="com.mysql.jdbc.commercialBuild"/>
 			<then>
 				<delete file="${packageDest}/COPYING"/>
-                                <copy file="${sourceDir}/lib-nodist/LICENSE.mysql" toDir="${packageDest}"/>
+                                <copy file="${com.mysql.jdbc.extra.libs}/LICENSE.mysql" toDir="${packageDest}"/>
 
 				<!-- For safety -->
 				<replaceregexp 
@@ -593,7 +597,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<sysproperty key="com.mysql.jdbc.testsuite.url" value="${com.mysql.jdbc.testsuite.url}"/>
 
 			<classpath>
-				<fileset dir="${sourceDir}/lib-nodist">
+				<fileset dir="${com.mysql.jdbc.extra.libs}">
 					<include name="**/*.jar"/>
 				</fileset>
 				<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -628,7 +632,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<sysproperty key="com.mysql.jdbc.testsuite.url" value="${com.mysql.jdbc.testsuite.url}"/>
 
 			<classpath>
-				<fileset dir="${sourceDir}/lib-nodist">
+				<fileset dir="${com.mysql.jdbc.extra.libs}">
 					<include name="**/*.jar"/>
 				</fileset>
 				<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -745,7 +749,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 
 			<classpath>
 				<pathelement location="${buildDir}/${fullProdName}"/>
-				<fileset dir="${sourceDir}/lib-nodist">
+				<fileset dir="${com.mysql.jdbc.extra.libs}">
 					<include name="**/*.jar"/>
 				</fileset>
 				<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -1040,7 +1044,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<jvmarg value="-Demma.coverage.out.merge=true" />
 			<sysproperty key="com.mysql.jdbc.testsuite.url" value="${com.mysql.jdbc.testsuite.url}"/>
 			<classpath>
-				<fileset dir="${sourceDir}/lib-nodist">
+				<fileset dir="${com.mysql.jdbc.extra.libs}">
 					<include name="**/*.jar"/>
 				</fileset>
 				<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -1092,7 +1096,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<sysproperty key="com.mysql.jdbc.compliance.url" value="${com.mysql.jdbc.compliance.url}"/>
 			<classpath>
 				<pathelement location="${buildDir}/${fullProdName}"/>
-				<fileset dir="${sourceDir}/lib-nodist">
+				<fileset dir="${com.mysql.jdbc.extra.libs}">
 					<include name="**/*.jar"/>
 				</fileset>
 				<fileset dir="${buildDir}/${fullProdName}/lib">
@@ -1153,7 +1157,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 				<sysproperty key="com.mysql.jdbc.testsuite.url" value="@{jdbcUrl}" />
 
 				<classpath>
-					<fileset dir="${sourceDir}/lib-nodist">
+					<fileset dir="${com.mysql.jdbc.extra.libs}">
 						<include name="**/*.jar" />
 					</fileset>
 					<fileset dir="${buildDir}/${fullProdName}/lib">

src/com/mysql/jdbc/BalanceStrategy.java

@@ -1,77 +1,77 @@
-/*
-  Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-
-  The MySQL Connector/J is licensed under the terms of the GPLv2
-  <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
-  There are special exceptions to the terms and conditions of the GPLv2 as it is applied to
-  this software, see the FLOSS License Exception
-  <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
-
-  This program is free software; you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation; version 2
-  of the License.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along with this
-  program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
-  Floor, Boston, MA 02110-1301  USA
- 
- */
-package com.mysql.jdbc;
-
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Implement this interface to provide a new load balancing strategy for URLs of
- * the form "jdbc:mysql:loadbalance://..", and provide the implementation class
- * name as the configuration parameter "loadBalanceStrategy".
- * 
- * The driver will not pass in a Connection instance when calling init(), but it
- * will pass in the Properties, otherwise it acts like a normal Extension.
- * 
- * One instance of a strategy *per* JDBC connection instance will be created. If
- * you need singleton-like behavior, you're on your own to provide it.
- */
-public interface BalanceStrategy extends Extension {
-	/**
-	 * Called by the driver to pick a new connection to route requests over.
-	 * 
-	 * @param proxy
-	 *            the InvocationHandler that deals with actual method calls to
-	 *            the JDBC connection, and serves as a factory for new
-	 *            connections for this strategy via the
-	 *            createConnectionForHost() method.
-	 * 
-	 * This proxy takes care of maintaining the response time list, map of
-	 * host/ports to live connections, and taking connections out of the live
-	 * connections map if they receive a network-related error while they are in
-	 * use by the application.
-	 * @param configuredHosts
-	 *            the list of hosts/ports (in "host:port" form) as passed in by
-	 *            the user.
-	 * @param liveConnections
-	 *            a map of host/ports to "live" connections to them.
-	 * @param responseTimes
-	 *            the list of response times for a <strong>transaction</strong>
-	 *            for each host in the configured hosts list.
-	 * @param numRetries
-	 *            the number of times the driver expects this strategy to re-try
-	 *            connection attempts if creating a new connection fails.
-	 * @return the physical JDBC connection for the application to use, based
-	 *         upon the strategy employed.
-	 * @throws SQLException
-	 *             if a new connection can not be found or created by this
-	 *             strategy.
-	 * 
-	 * @see LoadBalancingConnectionProxy#createConnectionForHost(String)
-	 */
-	public abstract ConnectionImpl pickConnection(
-			LoadBalancingConnectionProxy proxy, List<String> configuredHosts,
-			Map<String, ConnectionImpl> liveConnections, long[] responseTimes, int numRetries)
-			throws SQLException;
+/*
+  Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+
+  The MySQL Connector/J is licensed under the terms of the GPLv2
+  <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
+  There are special exceptions to the terms and conditions of the GPLv2 as it is applied to
+  this software, see the FLOSS License Exception
+  <http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+  This program is free software; you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation; version 2
+  of the License.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with this
+  program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
+  Floor, Boston, MA 02110-1301  USA
+ 
+ */
+package com.mysql.jdbc;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implement this interface to provide a new load balancing strategy for URLs of
+ * the form "jdbc:mysql:loadbalance://..", and provide the implementation class
+ * name as the configuration parameter "loadBalanceStrategy".
+ * 
+ * The driver will not pass in a Connection instance when calling init(), but it
+ * will pass in the Properties, otherwise it acts like a normal Extension.
+ * 
+ * One instance of a strategy *per* JDBC connection instance will be created. If
+ * you need singleton-like behavior, you're on your own to provide it.
+ */
+public interface BalanceStrategy extends Extension {
+	/**
+	 * Called by the driver to pick a new connection to route requests over.
+	 * 
+	 * @param proxy
+	 *            the InvocationHandler that deals with actual method calls to
+	 *            the JDBC connection, and serves as a factory for new
+	 *            connections for this strategy via the
+	 *            createConnectionForHost() method.
+	 * 
+	 * This proxy takes care of maintaining the response time list, map of
+	 * host/ports to live connections, and taking connections out of the live
+	 * connections map if they receive a network-related error while they are in
+	 * use by the application.
+	 * @param configuredHosts
+	 *            the list of hosts/ports (in "host:port" form) as passed in by
+	 *            the user.
+	 * @param liveConnections
+	 *            a map of host/ports to "live" connections to them.
+	 * @param responseTimes
+	 *            the list of response times for a <strong>transaction</strong>
+	 *            for each host in the configured hosts list.
+	 * @param numRetries
+	 *            the number of times the driver expects this strategy to re-try
+	 *            connection attempts if creating a new connection fails.
+	 * @return the physical JDBC connection for the application to use, based
+	 *         upon the strategy employed.
+	 * @throws SQLException
+	 *             if a new connection can not be found or created by this
+	 *             strategy.
+	 * 
+	 * @see LoadBalancingConnectionProxy#createConnectionForHost(String)
+	 */
+	public abstract ConnectionImpl pickConnection(
+			LoadBalancingConnectionProxy proxy, List<String> configuredHosts,
+			Map<String, ConnectionImpl> liveConnections, long[] responseTimes, int numRetries)
+			throws SQLException;
 }