.settings/org.eclipse.jdt.core.prefs

@@ -132,7 +132,7 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_e
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
@@ -408,3 +408,4 @@ org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

.settings/org.eclipse.jdt.ui.prefs

@@ -63,7 +63,7 @@ formatter_profile=_ConnectorJ Team
 formatter_settings_version=12
 internal.default.compliance=default
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;org;com;testsuite;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
 sp_cleanup.add_default_serial_version_id=true

CHANGES

@@ -1,5 +1,28 @@
 # Changelog
 # $Id$
+11-30-15 - Version 5.1.38
+
+  - Fix for Bug#21286268, CONNECTOR/J REPLICATION USE MASTER IF SLAVE IS UNAVAILABLE.
+
+  - Fix for Bug#21296840 & Bug#17910835, Server information in a group from Fabric is not refreshed after expired TTL.
+
+  - Fix for Bug#56122 (11763419), JDBC4 functionality failure when using replication connections.
+
+  - Added support for TLSv1.1 and TLSv1.2
+
+  - Fix for Bug#78961 (22096981), Can't call MySQL procedure with InOut parameters in Fabric environment.
+
+  - Fix for Bug#56100 (11763401), Replication driver routes DML statements to read-only slaves.
+
+  - StandardSSLSocketFactory implements SocketMetadata.
+
+  - Fix for Bug#21978216, GETTYPEINFO REPORT MAXIMUM PRECISION OF 255 FOR VARBINARY.
+
+  - Fix for Bug#78706 (21947042), Prefer TLS where supported by MySQL Server.
+
+  - Fix for Bug#21934573, FABRIC CODE INVOLVED IN THREAD DEADLOCK.
+    Duplicate: Bug#78710 (21966391), Deadlock on ReplicationConnection and ReplicationConnectionGroup when failover.
+
 10-15-15 - Version 5.1.37
 
   - Fix for Bug#21876798, CONNECTOR/J WITH MYSQL FABRIC AND SPRING PRODUCES PROXY ERROR.
@@ -13,10 +36,11 @@
 
   - Added tests for Optimizer hints syntax introduced in MySQL 5.7.7.
 
-  - Fix for Bug#Bug #21860833, JSON DATA TYPE DOESN'T WORK WITH SSPS.
+  - Fix for Bug#21860833, JSON DATA TYPE DOESN'T WORK WITH SSPS.
     Added support for JSON data type.
 
   - Added support for JDBC 4.2 new features.
+    New property 'enableEscapeProcessing' sets the default escape processing behavior for Statement objects.
 
   - Fix for Bug#16634180, LOCK WAIT TIMEOUT EXCEEDED CAUSES SQLEXCEPTION, SHOULD CAUSE SQLTRANSIENTEXCEPTION
 

README.md

@@ -14,6 +14,8 @@ Please refer to files README and COPYING, available in this repository, and [Leg
 
 MySQL Connector/J can be installed from pre-compiled packages that can be downloaded from the [MySQL downloads page](http://dev.mysql.com/downloads/connector/j/). Installing Connector/J only requires extracting the corresponding Jar file from the downloaded bundle and place it somewhere in the application's CLASSPATH.
 
+Alternatively you can setup [Maven's dependency management](http://search.maven.org/#search|ga|1|g%3A%22mysql%22%20AND%20a%3A%22mysql-connector-java%22) directly in your project and let it download it for you.
+
 ### Building from sources
 
 This driver can also be complied and installed from the sources available in this repository. Please refer to the documentation for [detailed instructions](http://dev.mysql.com/doc/connector-j/en/connector-j-installing-source.html) on how to do it.

build.xml

@@ -137,7 +137,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=yes
 
     <property name="major_version" value="5" />
     <property name="minor_version" value="1" />
-    <property name="subminor_version" value="37" />
+    <property name="subminor_version" value="38" />
     <property name="version_status" value="" />
 
     <property name="version" value="${major_version}.${minor_version}.${subminor_version}${version_status}" />
@@ -146,7 +146,8 @@ com.mysql.jdbc.noCleanBetweenCompiles=yes
     <property name="snapshot.version" value="-SNAPSHOT" />
     <property name="extra.version" value="" />
     <property name="full.version" value="${version}${extra.version}${snapshot.version}" />
-    <property name="fullProdName" value="${prodName}-${full.version}" />
+    <property name="extra.product.name" value="" />
+    <property name="fullProdName" value="${prodName}${extra.product.name}-${full.version}" />
     <property name="sourceDir" value="./src" />
     <property name="buildDir" value="./build" />
     <property name="distDir" value="./dist" />
@@ -678,6 +679,8 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
         <mkdir dir="${toPackage}" />
         <mkdir dir="${packageDest}" />
 
+        <delete dir="${toPackage}" />
+
         <patternset id="non.test.sources">
             <exclude name="**/*.nb*" />
             <exclude name="**/*.bak" />

src/com/mysql/fabric/jdbc/ErrorReportingExceptionInterceptor.java

@@ -55,8 +55,7 @@ public SQLException interceptException(SQLException sqlEx, Connection conn) {
         try {
             return fabricProxy.interceptException(sqlEx, conn, this.fabricHaGroup, this.hostname, this.port);
         } catch (FabricCommunicationException ex) {
-            return SQLError.createSQLException("Failed to report error to Fabric.", SQLError.SQL_STATE_COMMUNICATION_LINK_FAILURE, ex,
-                    conn.getExceptionInterceptor(), conn);
+            return SQLError.createSQLException("Failed to report error to Fabric.", SQLError.SQL_STATE_COMMUNICATION_LINK_FAILURE, ex, null);
         }
     }