CHANGES

@@ -1,5 +1,57 @@
 # Changelog
 # $Id$
+11-04-13 - Version 5.1.27
+
+  - Fix for Bug#17248345, getFunctionColumns() method returns columns of procedure.
+
+  - Fix for Bug#69290 (16879239), JDBC Table type "SYSTEM TABLE" is used inconsistently.
+
+  - Fix for Bug#68562, Combination rewriteBatchedStatements and useAffectedRows not working as expected.
+
+  - Fix for Bug#69452 (17015673), memory size connection property doesn't support large values well.
+
+  - Added tests for InnoDB full-text search support introduced in 5.6GA.
+
+  - Extended slow query warning with query execution plan for INSERT, REPLACE, UPDATE and DELETE.
+
+  - Added tests for IPv6 functions introduced in 5.6GA.
+
+  - Added support of authentication data up to 2^64-1 bytes.
+
+  - Fix for Bug#38252, ResultSet.absolute(0) is not behaving according to JDBC specification.
+
+  - Fix for Bug#62469, JDBC Authentication Fails with Null Byte in Scramble
+
+  - Fix for Bug#69506, XAER_DUPID error code is not returned when a duplicate XID is offered in Java.
+
+  - Added support for multi-master replication topographies in ReplicationDriver.  ReplicationDriver now uses two discrete load-balanced
+    connections, one each for master and slave connections.  The same load-balancing options which apply to load-balanced connections
+    now also apply to ReplicationConnections.  By default, this means that when a ReplicationConnection uses master connections
+    (because the read-only property of the Connection is false), work may be re-balanced between configured master hosts at transaction 
+    boundaries.  As with load-balanced connections, the ReplicationConnection host list may be managed within the JVM (see
+    com.mysql.jdbc.ReplicationConnectionGroupManager) or optionally via JMX (using replicationEnableJMX configuration option; see
+    com.mysql.jdbc.jmx.ReplicationGroupManagerMBean).  To specify multi-master replication topographies, define each host "type"
+    property using the following format:
+
+    address=(host=hostname)(port=3306)(type=[master|slave])
+
+    In the absense of explicit type definitions, the driver will assume a single master listed first, with all subsequently-listed
+    hosts configured as slaves.
+
+  - Fix for Bug#63354 (16443992), JDBC cannot make new connections if master is down.
+
+  - Fix for Bug#17003626, REGRESSION TEST FAILURE WITH SERVER VERSION 5.7.1
+
+  - Removed ant-contrib.jar from C/J distribution.
+
+  - Added tests for GIS precise spatial operations introduced in 5.6GA.
+
+  - Fixed META-INF information
+
+  - Fix for Bug#17251955, ARRAYINDEXOUTOFBOUNDSEXCEPTION ON LONG MULTI-BYTE DB/USER NAMES
+
+  - Fix for Bug#50538, DatabaseMetaData.getDriverVersion() contains unexpanded ${bzr.revision-id}
+
 08-05-13 - Version 5.1.26
 
   - Fix for Bug#69298 (16845965), Methods DatabaseMetaData.getProcedures() and DatabaseMetaData.getProcedureColumns(), in JDBC4,

README

@@ -63,59 +63,6 @@ Third-Party Component Notices
 
 ****************************************************************
 
-%%The following software may be included in this product:
-Ant-Contrib
-
-Use of any of this software is governed by the terms of the license below:
-
-* The Apache Software License, Version 1.1
-*
-* Copyright (c) 2001-2003 Ant-Contrib project.  All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer. 
-*
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in
-*    the documentation and/or other materials provided with the
-*    distribution.
-*
-* 3. The end-user documentation included with the redistribution, if
-*    any, must include the following acknowlegement:  
-*       "This product includes software developed by the 
-*        Ant-Contrib project (http://sourceforge.net/projects/ant-contrib)."
-*    Alternately, this acknowlegement may appear in the software itself,
-*    if and wherever such third-party acknowlegements normally appear.
-*
-* 4. The name Ant-Contrib must not be used to endorse or promote products 
-*    derived from this software without prior written permission. For
-*    written permission, please contact
-*    ant-contrib-developers@lists.sourceforge.net.
-*
-* 5. Products derived from this software may not be called "Ant-Contrib"
-*    nor may "Ant-Contrib" appear in their names without prior written
-*    permission of the Ant-Contrib project.
-*
-* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED.  IN NO EVENT SHALL THE ANT-CONTRIB PROJECT OR ITS
-* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-* ====================================================================
-
-*******************************************************************
-
 %%The following software may be included in this product:
 c3p0:JDBC DataSources/Resource Pools
 

build.xml

@@ -30,7 +30,7 @@
 
 	<property name="major_version" value="5"/>
 	<property name="minor_version" value="1"/>
-	<property name="subminor_version" value="26"/>
+	<property name="subminor_version" value="27"/>
 	<property name="version_status" value=""/>
 
 	<property name="version" value="${major_version}.${minor_version}.${subminor_version}${version_status}"/>
@@ -87,7 +87,12 @@
 
 	<taskdef resource="net/sf/antcontrib/antlib.xml">
 		<classpath>
-			<pathelement location="${sourceDir}/lib/ant-contrib.jar"/>
+			<fileset dir="${sourceDir}/lib-nodist" erroronmissingdir="false">
+				<include name="**/*.jar"/>
+			</fileset>
+			<fileset dir="${sourceDir}/lib">
+				<include name="**/*.jar"/>
+			</fileset>
 		</classpath>
 	</taskdef>
 
@@ -167,17 +172,29 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 
 		<exec dir="." executable="cmd" osfamily="windows" 
 			output="${buildDir}/bzr.properties" failonerror="false" 
-			failifexecutionfails="false">
+			failifexecutionfails="false"
+			resultproperty="bzrerror">
 			<arg line="/c bzr version-info" />
 		</exec>
 
 		<exec executable="bzr" osfamily="unix" 
 			output="${buildDir}/bzr.properties" failonerror="false" 
-			failifexecutionfails="false">
+			failifexecutionfails="false"
+			resultproperty="bzrerror">
 			<arg value="version-info" />
 		</exec>
 
-		<property prefix="bzr" file="${buildDir}/bzr.properties" />
+		<!-- We need the following workaround for the RE builds environment , which doesn't have access to bzr,
+		so bzr.properties file prepared in project root folder instead -->
+		<if>
+			<isset property="bzrerror"/>
+			<then>
+				<property prefix="bzr" file="./bzr.properties"/>
+			</then>
+			<else>
+				<property prefix="bzr" file="${buildDir}/bzr.properties"/>
+			</else>
+		</if>
 
 		<filterset id="versionFilterset">
 			<filter token="MYSQL_CJ_MAJOR_VERSION" value="${major_version}"/>
@@ -453,7 +470,7 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 			<section name="common">
 				<attribute name="Specification-Title" value="JDBC" />
 				<attribute name="Specification-Version" value="4.0" />
-				<attribute name="Specification-Vendor" value="Sun Microsystems Inc." />
+				<attribute name="Specification-Vendor" value="Oracle Corporation" />
 				<attribute name="Implementation-Title" value="${prodDisplayName}" />
 				<attribute name="Implementation-Version" value="${full.version}" />
 				<attribute name="Implementation-Vendor-Id" value="com.mysql" />
@@ -462,10 +479,10 @@ and the full path to the rt.jar from Java-6 with the property &quot;com.mysql.jd
 
 			<!-- OSGi -->
 
-			<attribute name="Bundle-Vendor" value="Sun Microsystems Inc." />
+			<attribute name="Bundle-Vendor" value="Oracle Corporation" />
 			<attribute name="Bundle-Classpath" value="." />
 			<attribute name="Bundle-Version" value="${osgid-version}" />
-			<attribute name="Bundle-Name" value="Sun Microsystems' JDBC Driver for MySQL" />
+			<attribute name="Bundle-Name" value="Oracle Corporation' JDBC Driver for MySQL" />
 			<attribute name="Bundle-ManifestVersion" value="2" />
 			<attribute name="Bundle-SymbolicName" value="com.mysql.jdbc" />
 			<attribute name="Export-Package" value="${driver-exports},${jee-exports},${logging-exports},${profiling-exports},${util-exports},${exceptions-exports},${jdbc4-exceptions-exports},${interceptors-exports},${integration-exports},${configs-exports},${legacy-exports}" />

src/com/mysql/jdbc/Buffer.java

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
  
 
   The MySQL Connector/J is licensed under the terms of the GPLv2
@@ -435,6 +435,13 @@ public final String readString() {
 		return s;
 	}
 
+	/**
+	 * Read string[NUL]
+	 * @param encoding
+	 * @param exceptionInterceptor
+	 * @return
+	 * @throws SQLException
+	 */
 	final String readString(String encoding, ExceptionInterceptor exceptionInterceptor) throws SQLException {
 		int i = this.position;
 		int len = 0;
@@ -456,30 +463,21 @@ final String readString(String encoding, ExceptionInterceptor exceptionIntercept
 	}
 
 	/**
-	 * Read a fixed length string
+	 * Read string[$len]
 	 */
 	final String readString(String encoding, ExceptionInterceptor exceptionInterceptor, int expectedLength) throws SQLException {
-		int i = this.position;
-		int len = 0;
-		int maxLen = getBufLength();
-
-		while ((i < maxLen) && (len < expectedLength) && (this.byteBuffer[i] != 0)) {
-			len++;
-			i++;
-		}
-
-		if (len < expectedLength) {
+		if (this.position + expectedLength > getBufLength()) {
 			throw SQLError.createSQLException(Messages.getString("ByteArrayBuffer.2"),
 					SQLError.SQL_STATE_ILLEGAL_ARGUMENT, exceptionInterceptor);
 		}
 
 		try {
-			return StringUtils.toString(this.byteBuffer, this.position, len, encoding);
+			return StringUtils.toString(this.byteBuffer, this.position, expectedLength, encoding);
 		} catch (UnsupportedEncodingException uEE) {
 			throw SQLError.createSQLException(Messages.getString("ByteArrayBuffer.1") //$NON-NLS-1$
 					+ encoding + "'", SQLError.SQL_STATE_ILLEGAL_ARGUMENT, exceptionInterceptor); //$NON-NLS-1$
 		} finally {
-			this.position += len; // update cursor
+			this.position += expectedLength; // update cursor
 		}
 	}
 
@@ -666,14 +664,14 @@ final void writeLongLong(long i) throws SQLException {
 
 	// Write null-terminated string
 	final void writeString(String s) throws SQLException {
-		ensureCapacity((s.length() * 2) + 1);
+		ensureCapacity((s.length() * 3) + 1);
 		writeStringNoNull(s);
 		this.byteBuffer[this.position++] = 0;
 	}
 
 	//	 Write null-terminated string in the given encoding
 	final void writeString(String s, String encoding, MySQLConnection conn) throws SQLException {
-		ensureCapacity((s.length() * 2) + 1);
+		ensureCapacity((s.length() * 3) + 1);
 		try {
 			writeStringNoNull(s, encoding, encoding, false, conn);
 		} catch (UnsupportedEncodingException ue) {
@@ -686,7 +684,7 @@ final void writeString(String s, String encoding, MySQLConnection conn) throws S
 	// Write string, with no termination
 	final void writeStringNoNull(String s) throws SQLException {
 		int len = s.length();
-		ensureCapacity(len * 2);
+		ensureCapacity(len * 3);
 		System.arraycopy(StringUtils.getBytes(s), 0, this.byteBuffer, this.position, len);
 		this.position += len;
 

src/com/mysql/jdbc/ConnectionImpl.java

@@ -1248,8 +1248,15 @@ public void changeUser(String userName, String newPassword)
 			if (newPassword == null) {
 				newPassword = "";
 			}
-
-			this.io.changeUser(userName, newPassword, this.database);
+
+			try {
+				this.io.changeUser(userName, newPassword, this.database);
+			} catch(SQLException ex) {
+				if (versionMeetsMinimum(5, 6, 13) && "28000".equals(ex.getSQLState())) {
+					cleanup(ex);
+				}
+				throw ex;
+			}
 			this.user = userName;
 			this.password = newPassword;
 
@@ -6090,8 +6097,8 @@ public void setNetworkTimeout(Executor executor, final int milliseconds) throws
 			executor.execute(new Runnable() {
 
 				public void run() {
-					setSocketTimeout(milliseconds); // for re-connects
 					try {
+						setSocketTimeout(milliseconds); // for re-connects
 						mysqlIo.setSocketTimeout(milliseconds);
 					} catch (SQLException e) {
 						throw new RuntimeException(e);