CHANGES

@@ -1,5 +1,30 @@
 # Changelog
 # $Id$
+12-23-13 - Version 5.1.28
+
+  - Fix for Bug#69579, DriverManager.setLoginTimeout not honored.
+
+  - Fix for Bug#51313, Escape processing is confused by multiple backslashes.
+
+  - Fix for Bug#55340, initializeResultsMetadataFromCache fails on second call to stored proc.
+
+  - Fix for Bug#70969, Shadow declaration of OperationNotSupportedException in RowDataDynamic.
+
+  - Fix for Bug#70835 (17750877), SQLExceptions thrown because of query interruption (KILL QUERY, query timeout, etc.)
+    didn't extend java.sql.SQLNonTransientException for JDBC4+ deployments.
+
+  - Fix for Bug#24344 test case, test fails if it's run with UTC timezone settings. 
+
+  - Fix for Bug#69777, Setting maxAllowedPacket below 8203 makes blobSendChunkSize negative.
+
+  - Fix for Bug#35115, yearIsDateType=false has no effect on result's column type and class.
+
+  - Fix for Bug#68916 (16691047), closeOnCompletion doesn't work.
+
+  - Fix for Bug #69746 (17164058), ResultSet closed after Statement.close() when dontTrackOpenResources=true
+
+  - Fix for Bug#70842 (17753369), Adding live management of replication host topographies.
+
 11-04-13 - Version 5.1.27
 
   - Fix for Bug#17248345, getFunctionColumns() method returns columns of procedure.

build.xml

@@ -30,7 +30,7 @@
 
 	<property name="major_version" value="5"/>
 	<property name="minor_version" value="1"/>
-	<property name="subminor_version" value="27"/>
+	<property name="subminor_version" value="28"/>
 	<property name="version_status" value=""/>
 
 	<property name="version" value="${major_version}.${minor_version}.${subminor_version}${version_status}"/>

src/com/mysql/jdbc/CallableStatement.java

@@ -308,8 +308,8 @@ public String getParameterClassName(int arg0) throws SQLException {
 				mysqlTypeIfKnown = MysqlDefs.FIELD_TYPE_INT24;
 			}
 
-			return ResultSetMetaData.getClassNameForJavaType(getParameterType(arg0), 
-					isUnsigned, mysqlTypeIfKnown, isBinaryOrBlob, false);
+			return ResultSetMetaData.getClassNameForJavaType(getParameterType(arg0), isUnsigned, mysqlTypeIfKnown,
+					isBinaryOrBlob, false, connection.getYearIsDateType());
 		}
 
 		public int getParameterCount() throws SQLException {

src/com/mysql/jdbc/ConnectionImpl.java

@@ -3621,14 +3621,23 @@ private void initializePropsFromServer() throws SQLException {
 				else if (serverMaxAllowedPacket == -1 && getMaxAllowedPacket() == -1)
 					setMaxAllowedPacket(65535);
 
-				int preferredBlobSendChunkSize = getBlobSendChunkSize();
-
-				int allowedBlobSendChunkSize = Math.min(preferredBlobSendChunkSize, 
-						getMaxAllowedPacket()) - 
-						ServerPreparedStatement.BLOB_STREAM_READ_BUF_SIZE 
-						- 11 /* LONG_DATA and MySQLIO packet header size */;
-
-				setBlobSendChunkSize(String.valueOf(allowedBlobSendChunkSize));
+				if (getUseServerPrepStmts()) {
+					int preferredBlobSendChunkSize = getBlobSendChunkSize();
+
+					// LONG_DATA and MySQLIO packet header size
+					int packetHeaderSize = ServerPreparedStatement.BLOB_STREAM_READ_BUF_SIZE + 11;
+					int allowedBlobSendChunkSize = Math.min(preferredBlobSendChunkSize, getMaxAllowedPacket())
+							- packetHeaderSize;
+
+					if (allowedBlobSendChunkSize <= 0) {
+						throw SQLError.createSQLException("Connection setting too low for 'maxAllowedPacket'. "
+								+ "When 'useServerPrepStmts=true', 'maxAllowedPacket' must be higher than "
+								+ packetHeaderSize + ". Check also 'max_allowed_packet' in MySQL configuration files.",
+								SQLError.SQL_STATE_INVALID_CONNECTION_ATTRIBUTE, getExceptionInterceptor());
+					}
+
+					setBlobSendChunkSize(String.valueOf(allowedBlobSendChunkSize));
+				}
 			}
 
 			if (this.serverVariables.containsKey("net_buffer_length")) {

src/com/mysql/jdbc/EscapeTokenizer.java

@@ -1,6 +1,5 @@
 /*
- Copyright (c) 2002, 2010, 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
   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
@@ -19,9 +18,6 @@
   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;
 
@@ -31,49 +27,38 @@
  * @author Mark Matthews
  */
 public class EscapeTokenizer {
-	// ~ Instance fields
-	// --------------------------------------------------------
+	private static final char CHR_ESCAPE = '\\';
+	private static final char CHR_SGL_QUOTE = '\'';
+	private static final char CHR_DBL_QUOTE = '"';
+	private static final char CHR_LF = '\n';
+	private static final char CHR_CR = '\r';
+	private static final char CHR_COMMENT = '-';
+	private static final char CHR_BEGIN_TOKEN = '{';
+	private static final char CHR_END_TOKEN = '}';
+	private static final char CHR_VARIABLE = '@';
 
-	private int bracesLevel = 0;
+	private String source = null;
+	private int sourceLength = 0;
+	private int pos = 0;
 
 	private boolean emittingEscapeCode = false;
-
-	private boolean inComment = false;
-
+	private boolean sawVariableUse = false;
+	private int bracesLevel = 0;
 	private boolean inQuotes = false;
-
-	private char lastChar = 0;
-
-	private char lastLastChar = 0;
-
-	private int pos = 0;
-
 	private char quoteChar = 0;
 
-	private boolean sawVariableUse = false;
-
-	private String source = null;
-
-	private int sourceLength = 0;
-
-	// ~ Constructors
-	// -----------------------------------------------------------
-
 	/**
 	 * Creates a new EscapeTokenizer object.
 	 * 
-	 * @param s
+	 * @param source
 	 *            the string to tokenize
 	 */
-	public EscapeTokenizer(String s) {
-		this.source = s;
-		this.sourceLength = s.length();
+	public EscapeTokenizer(String source) {
+		this.source = source;
+		this.sourceLength = source.length();
 		this.pos = 0;
 	}
 
-	// ~ Methods
-	// ----------------------------------------------------------------
-
 	/**
 	 * Does this tokenizer have more tokens available?
 	 * 
@@ -90,107 +75,109 @@ public synchronized boolean hasMoreTokens() {
 	 */
 	public synchronized String nextToken() {
 		StringBuffer tokenBuf = new StringBuffer();
+		boolean backslashEscape = false;
 
 		if (this.emittingEscapeCode) {
-			tokenBuf.append("{"); //$NON-NLS-1$
+			// Previous token ended at the beginning of an escape code, so this token must start with '{'
+			tokenBuf.append("{");
 			this.emittingEscapeCode = false;
 		}
 
 		for (; this.pos < this.sourceLength; this.pos++) {
 			char c = this.source.charAt(this.pos);
 
-			// Detect variable usage
-
-			if (!this.inQuotes && c == '@') {
-				this.sawVariableUse = true;
+			// process escape char: (\)
+			if (c == CHR_ESCAPE) {
+				tokenBuf.append(c);
+				backslashEscape = !backslashEscape;
+				continue;
 			}
 
-			if ((c == '\'' || c == '"') && !inComment) {
-				if (this.inQuotes && c == quoteChar) {
-					if (this.pos + 1 < this.sourceLength) {
-						if (this.source.charAt(this.pos + 1) == quoteChar) {
-							// Doubled-up quote escape, if the first quote isn't already escaped
-							if (this.lastChar != '\\') {
-								tokenBuf.append(quoteChar);
-								tokenBuf.append(quoteChar);
-								this.pos++;
-								continue;
-							}
-						}
-					}
-				}
-				if (this.lastChar != '\\') {
-					if (this.inQuotes) {
-						if (this.quoteChar == c) {
-							this.inQuotes = false;
-						}
-					} else {
-						this.inQuotes = true;
-						this.quoteChar = c;
-					}
-				} else if (this.lastLastChar == '\\') {
-					if (this.inQuotes) {
-						if (this.quoteChar == c) {
+			// process quotes: ('|")
+			if ((c == CHR_SGL_QUOTE || c == CHR_DBL_QUOTE) && !backslashEscape) {
+				tokenBuf.append(c);
+				if (this.inQuotes) {
+					if (c == this.quoteChar) {
+						// look ahead for doubled quote
+						if ((this.pos + 1 < this.sourceLength) && (this.source.charAt(this.pos + 1) == this.quoteChar)) {
+							tokenBuf.append(c);
+							this.pos++; // consume following char '\'' or '"'
+						} else {
 							this.inQuotes = false;
 						}
-					} else {
-						this.inQuotes = true;
-						this.quoteChar = c;
 					}
+				} else {
+					this.inQuotes = true;
+					this.quoteChar = c;
 				}
+				continue;
+			}
 
+			// process new line: (\n|\r)
+			if ((c == CHR_LF) || (c == CHR_CR)) {
 				tokenBuf.append(c);
-			} else if (c == '-') {
-				if ((this.lastChar == '-')
-						&& ((this.lastLastChar != '\\') && !this.inQuotes)) {
-					this.inComment = true;
-				}
-
-				tokenBuf.append(c);
-			} else if ((c == '\n') || (c == '\r')) {
-				this.inComment = false;
+				backslashEscape = false;
+				continue;
+			}
 
-				tokenBuf.append(c);
-			} else if (c == '{') {
-				if (this.inQuotes || this.inComment) {
+			if (!this.inQuotes && !backslashEscape) {
+				// process comments: (--)
+				if (c == CHR_COMMENT) {
 					tokenBuf.append(c);
-				} else {
-					this.bracesLevel++;
+					// look ahead for double hyphen
+					if ((this.pos + 1 < this.sourceLength) && (this.source.charAt(this.pos + 1) == CHR_COMMENT)) {
+						// consume following chars until new line or end of string
+						while (++this.pos < this.sourceLength && c != CHR_LF && c != CHR_CR) {
+							c = this.source.charAt(this.pos);
+							tokenBuf.append(c);
+						}
+						this.pos--;
+					}
+					continue;
+				}
 
+				// process begin token: ({)
+				if (c == CHR_BEGIN_TOKEN) {
+					this.bracesLevel++;
 					if (this.bracesLevel == 1) {
-						this.pos++;
 						this.emittingEscapeCode = true;
-
+						this.pos++; // consume char '{' before returning
 						return tokenBuf.toString();
 					}
-
 					tokenBuf.append(c);
+					continue;
 				}
-			} else if (c == '}') {
-				tokenBuf.append(c);
-
-				if (!this.inQuotes && !this.inComment) {
-					this.lastChar = c;
 
+				// process end token: (})
+				if (c == CHR_END_TOKEN) {
+					tokenBuf.append(c);
 					this.bracesLevel--;
-
 					if (this.bracesLevel == 0) {
-						this.pos++;
-
+						this.pos++; // consume char '}' before returning
 						return tokenBuf.toString();
 					}
+					continue;
+				}
+
+				// detect variable usage: (@)
+				if (c == CHR_VARIABLE) {
+					this.sawVariableUse = true;
 				}
-			} else {
-				tokenBuf.append(c);
 			}
 
-			this.lastLastChar = this.lastChar;
-			this.lastChar = c;
+			tokenBuf.append(c);
+			backslashEscape = false;
 		}
 
 		return tokenBuf.toString();
 	}
 
+	/**
+	 * Returns true if a variable reference was found. Note that this information isn't accurate until finishing to
+	 * process all tokens from source String. It also can't be used as per token basis.
+	 * 
+	 * @return true if a variable reference was found.
+	 */
 	boolean sawVariableUse() {
 		return this.sawVariableUse;
 	}

src/com/mysql/jdbc/JDBC4ResultSet.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
@@ -324,10 +324,6 @@ public SQLXML getSQLXML(String columnLabel) throws SQLException {
 		return getSQLXML(findColumn(columnLabel));
 	}
 
-	public synchronized boolean isClosed() throws SQLException {
-		return this.isClosed;
-	}
-
 	public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
 		throw new NotUpdatable();
 

src/com/mysql/jdbc/LoadBalancingConnectionProxy.java

@@ -616,11 +616,11 @@ public synchronized Object invoke(Object proxy, Method method, Object[] args, bo
 				this.isClosed = false;
 				this.closedReason = null;
 			} else {
-			String reason = "No operations allowed after connection closed.";
-			if(this.closedReason != null){
-				reason += ("  " + this.closedReason);
-			}
-			throw SQLError.createSQLException(
+				String reason = "No operations allowed after connection closed.";
+				if(this.closedReason != null){
+					reason += ("  " + this.closedReason);
+				}
+				throw SQLError.createSQLException(
 					reason,
 					SQLError.SQL_STATE_CONNECTION_NOT_OPEN, null /*
 																 * no access to