diff --git a/.gitignore b/.gitignore index 5692166..8a7e0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /mysql-connector-java-5.1.26-nojars.tar.xz /mysql-connector-java-5.1.28-nojars.tar.xz /mysql-connector-java-5.1.36-nojars.tar.xz +/mysql-connector-java-5.1.37-nojars.tar.xz diff --git a/mysql-connector-java-build.patch b/mysql-connector-java-5.1.37-build.patch similarity index 63% rename from mysql-connector-java-build.patch rename to mysql-connector-java-5.1.37-build.patch index 7faca29..7c65eed 100644 --- a/mysql-connector-java-build.patch +++ b/mysql-connector-java-5.1.37-build.patch @@ -1,14 +1,15 @@ ---- mysql-connector-java-5.1.36/build.xml.orig 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36/build.xml 2015-07-14 16:50:31.906927259 +0200 -@@ -155,7 +155,6 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye +diff -Nru mysql-connector-java-5.1.37/build.xml mysql-connector-java-5.1.37.build/build.xml +--- mysql-connector-java-5.1.37/build.xml 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.build/build.xml 2015-10-16 11:12:51.624810809 +0200 +@@ -165,7 +165,6 @@ - + - - + @@ -17,7 +18,24 @@ -@@ -208,10 +207,10 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye +@@ -192,8 +191,14 @@ + + + +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -218,10 +223,10 @@ @@ -30,14 +48,14 @@ -@@ -219,35 +218,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye +@@ -229,34 +234,7 @@ -- +- - - -- +- - - - @@ -52,7 +70,7 @@ - - - +-Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'."> - - - @@ -62,42 +80,36 @@ - - - -- -+ ++ + - -@@ -267,10 +238,7 @@ Java 6 (for JDBC4+ implementation) is al - - - -- -- -- -- -+ - - - -@@ -332,7 +300,7 @@ Java 6 (for JDBC4+ implementation) is al +@@ -274,13 +252,10 @@ -- -+ +- ++ - -@@ -775,37 +743,11 @@ Java 6 (for JDBC4+ implementation) is al - +- +- +- +- ++ + + + +@@ -810,39 +785,10 @@ + - - -- +- - -- Compiling MySQL Connector/J JDBC3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' +- Compiling MySQL Connector/J JDBC 3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' - - +- includeantruntime="false" +- source="1.5" +- target="1.5"> - - - @@ -119,88 +133,112 @@ - - - +- + depends="-compile-driver-jdbc4" /> - - + - + - Compiling MySQL Connector/J JDBC4+ implementation with '${com.mysql.jdbc.jdk6}' to '${compiler.output}' + Compiling MySQL Connector/J JDBC 4+ implementation with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk6}' to '${compiler.output}' ++ Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' + includeantruntime="false" +- source="1.5" +- target="1.5"> ++ source="1.6" ++ target="1.6"> -@@ -870,7 +812,7 @@ Java 6 (for JDBC4+ implementation) is al + + +@@ -946,7 +892,7 @@ - Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk6}' to '${compiler.output}' ++ Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' + includeantruntime="false" +- source="1.5" +- target="1.5"> ++ source="1.6" ++ target="1.6"> -@@ -889,7 +831,7 @@ Java 6 (for JDBC4+ implementation) is al + + +@@ -967,7 +913,7 @@ - Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk6}' to '${compiler.output}' ++ Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' + includeantruntime="false" +- source="1.5" +- target="1.5"> ++ source="1.6" ++ target="1.6"> -@@ -908,7 +850,7 @@ Java 6 (for JDBC4+ implementation) is al + + +@@ -988,7 +934,7 @@ - Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk6}' to '${compiler.output}' ++ Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' + includeantruntime="false" +- source="1.5" +- target="1.5"> ++ source="1.6" ++ target="1.6"> -@@ -1665,7 +1607,7 @@ Java 6 (for JDBC4+ implementation) is al + + +@@ -1788,7 +1734,7 @@ @@ -209,7 +247,7 @@ -@@ -1752,7 +1694,7 @@ Java 6 (for JDBC4+ implementation) is al +@@ -1875,7 +1821,7 @@ diff --git a/mysql-connector-java-jdbc-4.1.patch b/mysql-connector-java-5.1.37-jdbc4.1.patch similarity index 70% rename from mysql-connector-java-jdbc-4.1.patch rename to mysql-connector-java-5.1.37-jdbc4.1.patch index f488959..322376e 100644 --- a/mysql-connector-java-jdbc-4.1.patch +++ b/mysql-connector-java-5.1.37-jdbc4.1.patch @@ -1,22 +1,23 @@ -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java ---- mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-07-03 04:26:41.036544936 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java +--- mysql-connector-java-5.1.37/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-10-16 09:32:48.088261648 +0200 @@ -23,13 +23,20 @@ package com.mysql.fabric.jdbc; +import java.sql.Blob; -+import java.sql.Clob; import java.sql.CallableStatement; ++import java.sql.Clob; import java.sql.DatabaseMetaData; +import java.sql.NClob; import java.sql.PreparedStatement; ++import java.sql.Savepoint; +import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; +-import java.sql.Savepoint; +import java.sql.SQLXML; - import java.sql.Savepoint; import java.sql.Statement; +import java.sql.Struct; import java.util.ArrayList; @@ -38,7 +39,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLConne + } + + @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { ++ public void setClientInfo(String name, String value) throws SQLClientInfoException { + } + + @Override @@ -66,9 +67,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLConne + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java ---- mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-07-03 04:26:41.037544889 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java +--- mysql-connector-java-5.1.37/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-10-16 09:34:45.049426087 +0200 @@ -28,6 +28,7 @@ import java.sql.Driver; import java.sql.DriverManager; @@ -87,9 +88,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/fabric/jdbc/FabricMySQLDrive + throw new SQLFeatureNotSupportedException("no logging"); } } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/CallableStatement.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/CallableStatement.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/CallableStatement.java 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/CallableStatement.java 2015-07-03 04:26:41.039544793 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/CallableStatement.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/CallableStatement.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java 2015-10-16 09:16:50.875301816 +0200 @@ -33,10 +33,14 @@ import java.sql.Blob; import java.sql.Clob; @@ -105,22 +106,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/CallableStatement.java import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; -@@ -410,10 +414,10 @@ - * If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class iface) throws java.sql.SQLException { -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { - try { - // This works for classes that aren't actually wrapping anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor()); - } -@@ -2450,4 +2454,95 @@ - } - } +@@ -2417,4 +2421,95 @@ + + return super.executeLargeBatch(); } + + @Override @@ -139,22 +127,22 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/CallableStatement.java + } + + @Override -+ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException { ++ public Reader getCharacterStream(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getCharacterStream(String parameterName) throws SQLException { ++ public Reader getCharacterStream(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException { ++ public Reader getNCharacterStream(int parameterIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException { ++ public Reader getNCharacterStream(String parameterName) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -214,15 +202,16 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/CallableStatement.java + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ConnectionImpl.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ConnectionImpl.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/ConnectionImpl.java 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ConnectionImpl.java 2015-07-03 04:26:41.040544745 +0200 -@@ -35,11 +35,16 @@ +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/ConnectionImpl.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/ConnectionImpl.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java 2015-10-16 09:12:06.611696260 +0200 +@@ -35,12 +35,17 @@ import java.nio.charset.CharsetEncoder; import java.sql.Blob; import java.sql.DatabaseMetaData; +import java.sql.NClob; import java.sql.ResultSet; + import java.sql.ResultSetMetaData; +import java.sql.Savepoint; import java.sql.SQLException; import java.sql.SQLPermission; @@ -235,7 +224,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ConnectionImpl.java mys import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; -@@ -5595,4 +5600,70 @@ +@@ -5586,4 +5591,70 @@ public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { this.eventSink = h; } @@ -296,19 +285,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ConnectionImpl.java mys + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/DatabaseMetaData.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/DatabaseMetaData.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/DatabaseMetaData.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/DatabaseMetaData.java 2015-07-03 04:26:41.042544649 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/DatabaseMetaData.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/DatabaseMetaData.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java 2015-10-16 09:21:20.693689660 +0200 @@ -30,7 +30,9 @@ import java.lang.reflect.Constructor; import java.sql.PreparedStatement; @@ -319,7 +308,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/DatabaseMetaData.java m import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; -@@ -7884,4 +7886,25 @@ +@@ -7889,4 +7891,25 @@ public boolean generatedKeyAlwaysReturned() throws SQLException { return true; } @@ -335,19 +324,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/DatabaseMetaData.java m + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-07-03 04:26:41.043544601 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-10-16 09:43:48.814246466 +0200 @@ -33,8 +33,12 @@ import java.sql.CallableStatement; import java.sql.Clob; @@ -361,8 +350,8 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Callable import java.sql.Time; import java.sql.Timestamp; import java.util.Calendar; -@@ -2345,4 +2349,169 @@ - // throw SQLError.notImplemented(); +@@ -2347,4 +2351,169 @@ + // throw SQLError.createSQLFeatureNotSupportedException(); // } + @Override @@ -531,10 +520,10 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Callable + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-07-03 04:26:41.044544553 +0200 -@@ -24,9 +24,16 @@ +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-10-16 09:47:34.906698055 +0200 +@@ -24,9 +24,17 @@ package com.mysql.jdbc.jdbc2.optional; import java.lang.reflect.Constructor; @@ -544,6 +533,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Connecti +import java.sql.NClob; import java.sql.Savepoint; +import java.sql.SQLException; ++import java.sql.SQLException; +import java.sql.SQLClientInfoException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLXML; @@ -552,9 +542,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Connecti import java.util.Map; import java.util.Properties; import java.util.TimeZone; -@@ -2836,4 +2843,69 @@ - public void setEnabledSSLCipherSuites(String cipherSuites) { - this.mc.setEnabledSSLCipherSuites(cipherSuites); +@@ -2852,4 +2860,69 @@ + public void setEnableEscapeProcessing(boolean flag) { + this.mc.setEnableEscapeProcessing(flag); } + + @Override @@ -612,19 +602,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Connecti + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-07-03 04:26:41.044544553 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-10-16 10:53:46.681031679 +0200 @@ -25,6 +25,9 @@ import java.sql.Connection; @@ -646,9 +636,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlCon + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-07-03 04:26:41.044544553 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-10-16 10:39:23.749529296 +0200 @@ -26,8 +26,10 @@ import java.io.PrintWriter; import java.io.Serializable; @@ -662,7 +652,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlDat import javax.naming.Reference; @@ -429,4 +431,20 @@ // public T unwrap(Class iface) throws SQLException { - // throw SQLError.notImplemented(); + // throw SQLError.createSQLFeatureNotSupportedException(); // } + + @Override @@ -671,24 +661,31 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlDat + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-07-03 04:26:41.044544553 +0200 -@@ -33,6 +33,8 @@ +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-10-16 09:50:46.465066328 +0200 +@@ -26,6 +26,7 @@ + import java.lang.reflect.Constructor; + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.HashMap; + import java.util.Iterator; + import java.util.Map; +@@ -33,6 +34,7 @@ import javax.sql.ConnectionEvent; import javax.sql.ConnectionEventListener; import javax.sql.PooledConnection; -+import java.sql.SQLFeatureNotSupportedException; +import javax.sql.StatementEventListener; import com.mysql.jdbc.ExceptionInterceptor; @@ -706,9 +703,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlPoo + } \ Manca newline alla fine del file -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-07-03 04:26:41.045544505 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-10-16 09:51:48.788607295 +0200 @@ -27,6 +27,7 @@ import java.sql.Connection; import java.sql.ResultSet; @@ -737,9 +734,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXAC + public void removeStatementEventListener(StatementEventListener listener) {} + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-07-03 04:26:41.045544505 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-10-16 10:51:39.058673253 +0200 @@ -25,6 +25,9 @@ import java.sql.Connection; @@ -750,7 +747,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXAD import javax.sql.XAConnection; -@@ -63,4 +66,10 @@ +@@ -69,4 +72,10 @@ return MysqlXAConnection.getInstance((com.mysql.jdbc.Connection) conn, getLogXaCommands()); } @@ -762,9 +759,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/MysqlXAD + } \ Manca newline alla fine del file -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-07-03 04:26:41.045544505 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-10-16 09:41:06.596249766 +0200 @@ -32,12 +32,16 @@ import java.sql.Blob; import java.sql.Clob; @@ -782,11 +779,10 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Prepared import java.sql.Time; import java.sql.Timestamp; import java.util.Calendar; -@@ -1091,4 +1095,107 @@ - // public Object unwrap(Class arg0) throws SQLException { - // throw SQLError.notImplemented(); - // } -+ +@@ -1103,4 +1107,107 @@ + + return -1; // we actually never get here, but the compiler can't figure that out + } + + public void setNClob(String parameterName, NClob value) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); @@ -831,32 +827,32 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Prepared + } + + @Override -+ public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException { ++ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException { ++ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException{ ++ public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void setCharacterStream(int parameterIndex, java.io.Reader reader, long length) throws SQLException{ ++ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException{ + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void setBinaryStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void setAsciiStream(int parameterIndex, java.io.InputStream x, long length) throws SQLException { ++ public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -889,10 +885,11 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Prepared + public void setRowId(int parameterIndex, RowId x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } ++ } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-07-03 04:26:41.046544457 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-10-16 09:37:19.637846239 +0200 @@ -27,6 +27,7 @@ import java.sql.Connection; import java.sql.ResultSet; @@ -901,7 +898,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Statemen import java.sql.SQLWarning; import java.sql.Statement; -@@ -767,4 +768,40 @@ +@@ -910,4 +911,40 @@ checkAndFireConnectionError(sqlEx); } } @@ -932,19 +929,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Statemen + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-07-03 04:26:41.046544457 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-10-16 09:53:27.848109369 +0200 @@ -25,9 +25,11 @@ import java.lang.reflect.Constructor; @@ -957,7 +954,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Suspenda import javax.sql.XAConnection; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; -@@ -199,4 +201,11 @@ +@@ -199,4 +201,10 @@ this.currentXAConnection.close(); } } @@ -967,11 +964,10 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/jdbc2/optional/Suspenda + + @Override + public void removeStatementEventListener(StatementEventListener listener) {} -+ } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4Connection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4Connection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4Connection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4Connection.java 2015-07-03 04:26:41.046544457 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4Connection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4Connection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java 2015-10-16 10:14:55.297810812 +0200 @@ -27,11 +27,13 @@ import java.sql.Clob; import java.sql.SQLClientInfoException; @@ -986,17 +982,16 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4Connection.java my import com.mysql.jdbc.ConnectionImpl; import com.mysql.jdbc.Messages; -@@ -197,7 +199,8 @@ +@@ -197,7 +199,7 @@ /** * @see java.sql.Connection#createClob() */ - public Clob createClob() { -+ @Override + public com.mysql.jdbc.Clob createClob() throws SQLException { return new com.mysql.jdbc.Clob(getExceptionInterceptor()); } -@@ -233,4 +236,25 @@ +@@ -233,4 +235,25 @@ return this.infoProvider; } } @@ -1022,15 +1017,14 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4Connection.java my + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-07-03 04:26:41.047544409 +0200 -@@ -26,12 +26,14 @@ - import java.sql.Blob; +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-10-16 10:27:18.758132070 +0200 +@@ -27,11 +27,13 @@ import java.sql.Clob; import java.sql.SQLClientInfoException; -+import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLXML; import java.sql.NClob; import java.sql.Struct; @@ -1094,9 +1088,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLC + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-07-03 04:26:41.047544409 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-10-16 10:33:00.265444523 +0200 @@ -109,7 +109,7 @@ /** * @see java.sql.Connection#createClob() @@ -1106,9 +1100,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4MultiHostMySQLConn return this.getJDBC4Connection().createClob(); } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4MySQLConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-07-03 04:26:41.047544409 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4MySQLConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-10-16 10:30:14.365520681 +0200 @@ -59,10 +59,13 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException; @@ -1126,9 +1120,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/JDBC4MySQLConnection.ja + public NClob createNClob() throws SQLException; } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-07-03 04:26:41.047544409 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-10-16 09:28:56.545643631 +0200 @@ -23,7 +23,16 @@ package com.mysql.jdbc; @@ -1205,19 +1199,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/LoadBalancedMySQLConnec + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/MultiHostMySQLConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-07-03 04:26:41.048544361 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/MultiHostMySQLConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-10-16 09:26:03.620144161 +0200 @@ -23,13 +23,21 @@ package com.mysql.jdbc; @@ -1227,22 +1221,23 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/MultiHostMySQLConnectio import java.sql.CallableStatement; +import java.sql.Clob; import java.sql.DatabaseMetaData; - import java.sql.PreparedStatement; +import java.sql.NClob; + import java.sql.PreparedStatement; ++import java.sql.Savepoint; +import java.sql.SQLClientInfoException; import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; +-import java.sql.Savepoint; +import java.sql.SQLXML; - import java.sql.Savepoint; import java.sql.Statement; +import java.sql.Struct; import java.util.Calendar; import java.util.List; import java.util.Map; -@@ -2411,4 +2419,67 @@ - public void setEnabledSSLCipherSuites(String cipherSuites) { - getActiveMySQLConnection().setEnabledSSLCipherSuites(cipherSuites); +@@ -2427,4 +2435,67 @@ + public void setEnableEscapeProcessing(boolean flag) { + getActiveMySQLConnection().setEnableEscapeProcessing(flag); } + + @Override @@ -1298,43 +1293,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/MultiHostMySQLConnectio + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/MysqlParameterMetadata.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/MysqlParameterMetadata.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/MysqlParameterMetadata.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/MysqlParameterMetadata.java 2015-07-03 04:26:41.048544361 +0200 -@@ -25,6 +25,7 @@ - - import java.sql.ParameterMetaData; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.Types; - - public class MysqlParameterMetadata implements ParameterMetaData { -@@ -199,10 +200,10 @@ - * If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class iface) throws java.sql.SQLException { -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { - try { - // This works for classes that aren't actually wrapping anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); - } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/NonRegisteringDriver.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/NonRegisteringDriver.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-07-03 04:26:41.049544313 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/NonRegisteringDriver.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-10-16 09:09:05.436507897 +0200 @@ -31,6 +31,7 @@ import java.net.URLDecoder; import java.sql.DriverPropertyInfo; @@ -1351,7 +1322,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/NonRegisteringDriver.ja /** * The Java SQL framework allows for multiple database drivers. Each driver should supply a class that implements the Driver interface -@@ -904,4 +906,10 @@ +@@ -906,4 +908,10 @@ } } } @@ -1362,9 +1333,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/NonRegisteringDriver.ja + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/PreparedStatement.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/PreparedStatement.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/PreparedStatement.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/PreparedStatement.java 2015-07-03 04:26:41.050544266 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/PreparedStatement.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/PreparedStatement.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java 2015-10-16 08:56:24.710818231 +0200 @@ -43,9 +43,13 @@ import java.sql.Clob; import java.sql.DatabaseMetaData; @@ -1379,9 +1350,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/PreparedStatement.java import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; -@@ -5134,4 +5138,20 @@ - return StringUtils.startsWithIgnoreCaseAndWs(sql, "INSERT", statementStartPos) - && StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", StringUtils.SEARCH_MODE__MRK_COM_WS) == -1 && rewritableOdku; +@@ -5093,4 +5097,20 @@ + public long executeLargeUpdate() throws SQLException { + return executeUpdateInternal(true, false); } + + @Override @@ -1400,9 +1371,9 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/PreparedStatement.java + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ReplicationConnection.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ReplicationConnection.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/ReplicationConnection.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ReplicationConnection.java 2015-07-03 04:26:41.051544218 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/ReplicationConnection.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/ReplicationConnection.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/ReplicationConnection.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/ReplicationConnection.java 2015-10-16 10:21:48.558204658 +0200 @@ -23,13 +23,19 @@ package com.mysql.jdbc; @@ -1424,11 +1395,11 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ReplicationConnection.j import java.util.ArrayList; import java.util.List; import java.util.Map; -@@ -3013,4 +3019,68 @@ - public void setEnabledSSLCipherSuites(String cipherSuites) { - getCurrentConnection().setEnabledSSLCipherSuites(cipherSuites); +@@ -3030,4 +3036,68 @@ + public void setEnableEscapeProcessing(boolean flag) { + getCurrentConnection().setEnableEscapeProcessing(flag); } -+ ++ + @Override + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); @@ -1483,19 +1454,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ReplicationConnection.j + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ResultSetImpl.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ResultSetImpl.java 2015-07-03 04:26:41.052544170 +0200 +diff -Nru mysql-connector-java-5.1.37/src/com/mysql/jdbc/ResultSetImpl.java mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java +--- mysql-connector-java-5.1.37/src/com/mysql/jdbc/ResultSetImpl.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java 2015-10-16 09:02:44.049202037 +0200 @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStream; @@ -1518,7 +1489,7 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java mysq import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; -@@ -7929,4 +7934,250 @@ +@@ -7923,4 +7928,250 @@ protected ExceptionInterceptor getExceptionInterceptor() { return this.exceptionInterceptor; } @@ -1529,42 +1500,42 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java mysq + } + + @Override -+ public void updateNClob(String columnLabel, Reader reader) throws SQLException { ++ public void updateNClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { ++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { ++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNClob(int columnIndex, Reader reader) throws SQLException { ++ public void updateNClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(int columnIndex, Reader reader) throws SQLException { ++ public void updateClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(String columnLabel, Reader reader) throws SQLException { ++ public void updateClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { ++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { ++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -1579,42 +1550,42 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java mysq + } + + @Override -+ public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(String columnLabel, java.io.InputStream x) throws SQLException { ++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(String columnLabel, java.io.InputStream x) throws SQLException { ++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(int columnIndex, java.io.InputStream x) throws SQLException { ++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(int columnIndex, java.io.InputStream x) throws SQLException { ++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -1629,52 +1600,52 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java mysq + } + + @Override -+ public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(String columnLabel, java.io.InputStream x, long length) throws SQLException { ++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(String columnLabel, java.io.InputStream x, long length) throws SQLException { ++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(int columnIndex, java.io.InputStream x, long length) throws SQLException { ++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(int columnIndex, java.io.InputStream x, long length) throws SQLException { ++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException { ++ public Reader getNCharacterStream(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getNCharacterStream(String columnIndex) throws SQLException { ++ public Reader getNCharacterStream(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -1759,77 +1730,19 @@ diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetImpl.java mysq + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetMetaData.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ResultSetMetaData.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/ResultSetMetaData.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/ResultSetMetaData.java 2015-07-03 04:26:41.053544122 +0200 -@@ -23,7 +23,9 @@ - - package com.mysql.jdbc; - -+import java.sql.NClob; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.Types; - - /** -@@ -832,12 +834,17 @@ - * If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class iface) throws java.sql.SQLException { -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { - try { - // This works for classes that aren't actually wrapping anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); - } - } -+ -+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ - } -diff -Nru mysql-connector-java-5.1.36/src/com/mysql/jdbc/StatementImpl.java mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/StatementImpl.java ---- mysql-connector-java-5.1.36/src/com/mysql/jdbc/StatementImpl.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/com/mysql/jdbc/StatementImpl.java 2015-07-03 04:26:41.054544074 +0200 -@@ -31,6 +31,8 @@ - import java.sql.SQLException; - import java.sql.SQLWarning; - import java.sql.Types; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.*; - import java.util.ArrayList; - import java.util.Calendar; - import java.util.Collections; -@@ -2686,10 +2688,10 @@ - * If no object found that implements the interface - * @since 1.6 - */ -- public Object unwrap(Class iface) throws java.sql.SQLException { -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { - try { - // This works for classes that aren't actually wrapping anything -- return Util.cast(iface, this); -+ return iface.cast(this); - } catch (ClassCastException cce) { - throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor()); - } -diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressionTest.java mysql-connector-java-5.1.36.jdbc4.1/src/testsuite/regression/StatementRegressionTest.java ---- mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressionTest.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36.jdbc4.1/src/testsuite/regression/StatementRegressionTest.java 2015-07-03 04:26:41.055544026 +0200 +diff -Nru mysql-connector-java-5.1.37/src/testsuite/regression/StatementRegressionTest.java mysql-connector-java-5.1.37.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java +--- mysql-connector-java-5.1.37/src/testsuite/regression/StatementRegressionTest.java 2015-10-06 17:24:38.000000000 +0200 ++++ mysql-connector-java-5.1.37.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java 2015-10-16 10:49:27.216616194 +0200 @@ -47,12 +47,16 @@ import java.sql.Connection; import java.sql.DataTruncation; @@ -1840,14 +1753,14 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi import java.sql.ResultSet; import java.sql.ResultSetMetaData; +import java.sql.RowId; -+import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; import java.sql.SQLWarning; +import java.sql.SQLXML; import java.sql.Statement; import java.sql.Time; import java.sql.Timestamp; -@@ -2319,7 +2323,8 @@ +@@ -2260,7 +2264,8 @@ try { pStmt = this.conn.prepareStatement("INSERT INTO testNullClob VALUES (?)"); @@ -1857,7 +1770,7 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi pStmt.executeUpdate(); } finally { if (pStmt != null) { -@@ -4605,6 +4610,262 @@ +@@ -4538,6 +4543,261 @@ public int getBytesSize() throws SQLException { return 0; } @@ -1878,42 +1791,42 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi + } + + @Override -+ public void updateNClob(String columnLabel, Reader reader) throws SQLException { ++ public void updateNClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { ++ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { ++ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNClob(int columnIndex, Reader reader) throws SQLException { ++ public void updateNClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(int columnIndex, Reader reader) throws SQLException { ++ public void updateClob(int columnIndex, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(String columnLabel, Reader reader) throws SQLException { ++ public void updateClob(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { ++ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { ++ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -1928,42 +1841,42 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi + } + + @Override -+ public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(String columnLabel, java.io.InputStream x) throws SQLException { ++ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(String columnLabel, java.io.InputStream x) throws SQLException { ++ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(int columnIndex, java.io.InputStream x) throws SQLException { ++ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(int columnIndex, java.io.InputStream x) throws SQLException { ++ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException { ++ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException { ++ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -1978,52 +1891,52 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi + } + + @Override -+ public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(String columnLabel, java.io.InputStream x, long length) throws SQLException { ++ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(String columnLabel, java.io.InputStream x, long length) throws SQLException { ++ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateBinaryStream(int columnIndex, java.io.InputStream x, long length) throws SQLException { ++ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateAsciiStream(int columnIndex, java.io.InputStream x, long length) throws SQLException { ++ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException { ++ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException { ++ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException { ++ public Reader getNCharacterStream(int columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public java.io.Reader getNCharacterStream(String columnIndex) throws SQLException { ++ public Reader getNCharacterStream(String columnIndex) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -2068,7 +1981,7 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi + } + + @Override -+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { ++ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + @@ -2108,15 +2021,14 @@ diff -Nru mysql-connector-java-5.1.36/src/testsuite/regression/StatementRegressi + } + + @Override -+ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { ++ public boolean isWrapperFor(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } + + @Override -+ public T unwrap(java.lang.Class iface) throws java.sql.SQLException { ++ public T unwrap(Class iface) throws SQLException { + throw new SQLFeatureNotSupportedException("Not supported"); + } -+ }; } diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 02a4187..b7bd9a2 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,23 +1,22 @@ %global builddir build-mysql-jdbc %global distdir dist-mysql-jdbc -Summary: Official JDBC driver for MySQL -Name: mysql-connector-java -Version: 5.1.36 -Release: 1%{?dist} -Epoch: 1 - -# MySQL FLOSS Exception -License: GPLv2 with exceptions -URL: http://dev.mysql.com/downloads/connector/j/ +Summary: Official JDBC driver for MySQL +Name: mysql-connector-java +Version: 5.1.37 +Release: 1%{?dist} +Epoch: 1 +License: GPLv2 with exceptions +URL: http://dev.mysql.com/downloads/connector/j/ +Source0: %{name}-%{version}-nojars.tar.xz # Mysql has a mirror redirector for its downloads # You can get this tarball by following a link from: -# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz +# http://dev.mysql.com/get/Downloads/Connector-J/%%{name}-%%{version}.tar.gz # # Following prebuilt jars and sources have been removed from the tarball: # -# %{name}-%{version}-bin.jar +# %%{name}-%%{version}-bin.jar # src/lib/c3p0-0.9.1-pre6.jar # src/lib/c3p0-0.9.1-pre6.src.zip # src/lib/jboss-common-jdbc-wrapper.jar @@ -25,33 +24,33 @@ URL: http://dev.mysql.com/downloads/connector/j/ # src/lib/slf4j-api-1.6.1.jar # # See http://bugs.mysql.com/bug.php?id=28512 for details. -Source0: %{name}-%{version}-nojars.tar.xz # To make it easier a script generate-tarball.sh has been created: # ./generate-tarball.sh version # will create a new tarball compressed with xz and without those jar files. -Source1: generate-tarball.sh - +Source1: generate-tarball.sh # Patch to build with JDBC 4.1/Java 7 -Patch0: %{name}-jdbc-4.1.patch -Patch1: %{name}-build.patch -Patch2: %{name}-hibernate.patch +Patch0: %{name}-5.1.37-jdbc4.1.patch +# Add system libraries +Patch1: %{name}-5.1.37-build.patch +Patch2: %{name}-hibernate.patch -BuildArch: noarch +BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: ant >= 1.6.0 -BuildRequires: ant-contrib >= 1.0 -BuildRequires: bzr -BuildRequires: javapackages-local -BuildRequires: jta >= 1.0 -BuildRequires: junit -BuildRequires: slf4j -BuildRequires: apache-commons-logging -BuildRequires: hibernate-core +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: ant >= 1.6.0 +BuildRequires: ant-contrib >= 1.0 +BuildRequires: bzr +BuildRequires: c3p0 +BuildRequires: javapackages-local +BuildRequires: jta >= 1.0 +BuildRequires: junit +BuildRequires: slf4j +BuildRequires: apache-commons-logging +BuildRequires: hibernate-core -Requires: jta >= 1.0 -Requires: slf4j +Requires: jta >= 1.0 +Requires: slf4j %description MySQL Connector/J is a native Java driver that converts JDBC (Java Database @@ -92,7 +91,8 @@ rm src/testsuite/simple/ReadOnlyCallableStatementTest.java rm src/testsuite/simple/jdbc4/StatementsTest.java ant -DbuildDir=%{builddir} -DdistDir=%{distdir} \ - -Dcom.mysql.jdbc.jdk6=%{java_home} \ + -Dcom.mysql.jdbc.jdk8=%{java_home} \ + -Dcom.mysql.jdbc.jdk6=%{java_home}/jre/lib/rt.jar \ -Dcom.mysql.jdbc.extra.libs=/usr/share/java \ dist @@ -107,6 +107,9 @@ ant -DbuildDir=%{builddir} -DdistDir=%{distdir} \ %license COPYING %changelog +* Fri Oct 16 2015 gil cattaneo 1:5.1.37-1 +- update to 5.1.37 + * Thu Jun 25 2015 Jakub Dorňák - 1:5.1.36-1 - Rebase to version 5.1.36 Resolves rhbz#1061093 diff --git a/sources b/sources index fc9a52c..441a75d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c953cd2dbc9eef654f59f0323be9575e mysql-connector-java-5.1.36-nojars.tar.xz +0a277c3c19a187860b98dbf81fce1536 mysql-connector-java-5.1.37-nojars.tar.xz