#1 new version 8.0.12
Merged 5 years ago by jjanco. Opened 5 years ago by jjanco.
rpms/ jjanco/mysql-connector-java master  into  master

file modified
+2
@@ -9,3 +9,5 @@ 

  /mysql-connector-java-5.1.36-nojars.tar.xz

  /mysql-connector-java-5.1.37-nojars.tar.xz

  /mysql-connector-java-5.1.38-nojars.tar.xz

+ /mysql-connector-java-8.0.11-nojars.tar.xz

+ /mysql-connector-java-8.0.12-nojars.tar.xz

@@ -0,0 +1,11 @@ 

+ --- mysql-connector-j-5.1.38/build.xml.orig	2018-05-23 08:15:09.293543900 -0400

+ +++ mysql-connector-j-5.1.38/build.xml	2018-05-23 07:24:52.219543900 -0400

+ @@ -358,7 +358,7 @@

+                  <not>

+                      <and>

+                          <equals arg1="${com.mysql.cj.build.jdk.exitstatus}" arg2="0" />

+ -                        <contains string="${com.mysql.cj.build.jdk.version}" substring="java version &quot;1.8" casesensitive="true" />

+ +                        <contains string="${com.mysql.cj.build.jdk.version}" substring="openjdk version &quot;1.8" casesensitive="true" />

+                      </and>

+                  </not>

+              </condition>

@@ -1,258 +0,0 @@ 

- diff -Nru mysql-connector-j-5.1.38/build.xml mysql-connector-j-5.1.38.build/build.xml

- --- mysql-connector-j-5.1.38/build.xml	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.build/build.xml	2015-12-08 09:12:11.344825605 +0100

- @@ -166,7 +166,6 @@

-      </condition>

-  

-      <!-- The following properties are needed for finding JDK5 and JDK8 needed for compile and can be passed on the command line to ant via -D switches. -->

- -    <property name="com.mysql.jdbc.jdk5" value="/usr/lib/jvm/jdk1.5" />

-      <property name="com.mysql.jdbc.jdk8" value="/usr/lib/jvm/jdk1.8" />

-  

-      <!-- The following property allows to point the location of third-party libraries we don't distribute. Default value points to src/lib so user could either

- @@ -174,7 +173,7 @@

-      <property name="com.mysql.jdbc.extra.libs" value="${sourceDir}/lib" />

-  

-      <!-- The following property is needed for finding a JVM to execute the tests and can be passed on the command line to ant via -D switch. -->

- -    <property name="com.mysql.jdbc.testsuite.jvm" value="${com.mysql.jdbc.jdk5}" />

- +    <property name="com.mysql.jdbc.testsuite.jvm" value="${com.mysql.jdbc.jdk6}" />

-  

-      <!-- The following property is needed for building the docs and must be passed on the command line to ant via -D switch. -->

-      <property name="com.mysql.jdbc.docs.sourceDir" value="/tmp/connectorj/docs/prebuilt" />

- @@ -193,8 +192,14 @@

-      </path>

-  

-      <path id="project.build.classpath">

- -        <fileset dir="${com.mysql.jdbc.extra.libs}">

- -            <include name="**/*.jar" />

- +        <fileset dir="/usr/share/java">

- +            <include name="hamcrest/all.jar" />

- +            <include name="junit.jar" />

- +            <include name="commons-logging.jar" />

- +            <include name="slf4j/api.jar" />

- +            <include name="jta.jar" />

- +            <include name="c3p0/c3p0.jar" />

- +            <include name="hibernate/hibernate-core.jar" />

-          </fileset>

-  

-          <fileset dir="${buildDir}/${fullProdName}/lib">

- @@ -219,10 +224,10 @@

-                  </not>

-              </condition>

-          </fail>

- -        <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate4'.">

- +        <fail message="Hibernate libraries, required for build tasks, must be in the directory '${com.mysql.jdbc.extra.libs}/hibernate'.">

-              <condition>

-                  <not>

- -                    <available file="${com.mysql.jdbc.extra.libs}/hibernate4" type="dir" />

- +                    <available file="${com.mysql.jdbc.extra.libs}/hibernate" type="dir" />

-                  </not>

-              </condition>

-          </fail>

- @@ -230,34 +235,7 @@

-  

-  

-      <!-- Check for required JDKs for compilation. -->

- -    <target name="-compiler-check" depends="-jdk5-check, -jdk8-check, -jre6-rtjar-check" />

- -

- -

- -    <!-- Check for required JDK5 for compilation of JDBC 3 implementation. -->

- -    <target name="-jdk5-check">

- -        <property name="com.mysql.jdbc.jdk5.java" value="${com.mysql.jdbc.jdk5}/bin/java" />

- -        <property name="com.mysql.jdbc.jdk5.javac" value="${com.mysql.jdbc.jdk5}/bin/javac" />

- -

- -        <local name="com.mysql.jdbc.jdk5.version" />

- -        <exec executable="${com.mysql.jdbc.jdk5.java}"

- -              outputproperty="com.mysql.jdbc.jdk5.version"

- -              failonerror="false"

- -              failifexecutionfails="false"

- -              resultproperty="jdk5checkexitstatus">

- -            <arg value="-version" />

- -        </exec>

- -

- -        <fail message="Java 5 is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk5'. Default: '/usr/lib/jvm/jdk1.5').

- -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'.">

- -            <condition>

- -                <not>

- -                    <and>

- -                        <equals arg1="${jdk5checkexitstatus}" arg2="0" />

- -                        <contains string="${com.mysql.jdbc.jdk5.version}" substring="java version &quot;1.5" casesensitive="true" />

- -                    </and>

- -                </not>

- -            </condition>

- -        </fail>

- +    <target name="-compiler-check" depends="-jdk8-check, -jre6-rtjar-check">

-      </target>

-  

-  

- @@ -275,13 +253,10 @@

-              <arg value="-version" />

-          </exec>

-  

- -        <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'.">

- +        <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '${com.mysql.jdbc.jdk8}'.">

-              <condition>

-                  <not>

- -                    <and>

- -                        <equals arg1="${jdk8checkexitstatus}" arg2="0" />

- -                        <contains string="${com.mysql.jdbc.jdk8.version}" substring="java version &quot;1.8" casesensitive="true" />

- -                    </and>

- +                    <equals arg1="${jdk8checkexitstatus}" arg2="0" />

-                  </not>

-              </condition>

-          </fail>

- @@ -813,39 +788,10 @@

-      <!-- Compile the driver including JDBC 3 and JDBC 4+ implementations only. -->

-      <target name="compile-driver"

-              description="Compiles driver including JDBC 3 and JDBC 4+ implementations only."

- -            depends="-compile-driver-jdbc3, -compile-driver-jdbc4" />

- -

- -

- -    <!-- Compile JDBC 3 implementation. -->

- -    <target name="-compile-driver-jdbc3" depends="init, -clean-output">

- -        <echo>Compiling MySQL Connector/J JDBC 3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>

- -

- -        <javac sourcepath=""

- -               srcdir="${buildDir}/${fullProdName}"

- -               destdir="${compiler.output}"

- -               deprecation="off"

- -               debug="${debug.enable}"

- -               fork="yes"

- -               executable="${com.mysql.jdbc.jdk5.javac}"

- -               compiler="modern"

- -               includeantruntime="false"

- -               source="1.5"

- -               target="1.5">

- -            <include name="**/*.java" />

- -            <exclude name="testsuite/**" />

- -            <exclude name="com/mysql/jdbc/integration/**" />

- -            <exclude name="com/mysql/jdbc/log/Log4JLogger.java" />

- -            <exclude name="**/JDBC4*.java" />

- -            <exclude name="**/FabricMultiTenantConnectionProvider.java" />

- -            <exclude name="**/HibernateFabric.java" />

- -            <exclude name="com/mysql/jdbc/exceptions/jdbc4/*" />

- -            <classpath refid="project.build.classpath" />

- -        </javac>

- -    </target>

- -

- +            depends="-compile-driver-jdbc4" />

-  

-      <!-- Compile JDBC 4+ implementation. -->

- -    <target name="-compile-driver-jdbc4" depends="-compile-driver-jdbc3">

- +    <target name="-compile-driver-jdbc4">

-          <echo>Compiling MySQL Connector/J JDBC 4+ implementation with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>

-  

-          <javac sourcepath=""

- @@ -889,7 +835,7 @@

-      <target name="compile-testsuite"

-              description="Compiles driver including JDBC 3 and JDBC 4+ implementations and JUnit test suite."

-              depends="init, compile-driver">

- -        <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>

- +        <echo>Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>

-  

-          <javac sourcepath=""

-                 srcdir="${buildDir}/${fullProdName}"

- @@ -897,11 +843,11 @@

-                 deprecation="off"

-                 debug="${debug.enable}"

-                 fork="yes"

- -               executable="${com.mysql.jdbc.jdk5.javac}"

- +               executable="${com.mysql.jdbc.jdk8.javac}"

-                 compiler="modern"

-                 includeantruntime="false"

- -               source="1.5"

- -               target="1.5">

- +               source="1.6"

- +               target="1.6">

-              <include name="testsuite/**" />

-              <exclude name="testsuite/requiresNonRedists/**" />

-              <exclude name="testsuite/**/jdbc4*/**" />

- @@ -949,7 +895,7 @@

-  

-      <!-- Compile c3p0 integration. -->

-      <target name="-compile-integration-c3p0" depends="compile-driver" if="com.mysql.jdbc.c3p0Present">

- -        <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>

- +        <echo>Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>

-  

-          <javac sourcepath=""

-                 srcdir="${buildDir}/${fullProdName}"

- @@ -957,11 +903,11 @@

-                 deprecation="off"

-                 debug="${debug.enable}"

-                 fork="yes"

- -               executable="${com.mysql.jdbc.jdk5.javac}"

- +               executable="${com.mysql.jdbc.jdk8.javac}"

-                 compiler="modern"

-                 includeantruntime="false"

- -               source="1.5"

- -               target="1.5">

- +               source="1.6"

- +               target="1.6">

-              <include name="com/mysql/jdbc/integration/c3p0/**" />

-              <classpath refid="project.build.classpath" />

-          </javac>

- @@ -970,7 +916,7 @@

-  

-      <!-- Compile jBoss integration. -->

-      <target name="-compile-integration-jboss" depends="compile-driver" if="com.mysql.jdbc.jbossPresent">

- -        <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>

- +        <echo>Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>

-  

-          <javac sourcepath=""

-                 srcdir="${buildDir}/${fullProdName}"

- @@ -978,11 +924,11 @@

-                 deprecation="off"

-                 debug="${debug.enable}"

-                 fork="yes"

- -               executable="${com.mysql.jdbc.jdk5.javac}"

- +               executable="${com.mysql.jdbc.jdk8.javac}"

-                 compiler="modern"

-                 includeantruntime="false"

- -               source="1.5"

- -               target="1.5">

- +               source="1.6"

- +               target="1.6">

-              <include name="com/mysql/jdbc/integration/jboss/**" />

-              <classpath refid="project.build.classpath" />

-          </javac>

- @@ -991,7 +937,7 @@

-  

-      <!-- Compile Log4j integration. -->

-      <target name="-compile-integration-log4j" depends="compile-driver" if="com.mysql.jdbc.log4jPresent">

- -        <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}'</echo>

- +        <echo>Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}'</echo>

-  

-          <javac sourcepath=""

-                 srcdir="${buildDir}/${fullProdName}"

- @@ -999,11 +945,11 @@

-                 deprecation="off"

-                 debug="${debug.enable}"

-                 fork="yes"

- -               executable="${com.mysql.jdbc.jdk5.javac}"

- +               executable="${com.mysql.jdbc.jdk8.javac}"

-                 compiler="modern"

-                 includeantruntime="false"

- -               source="1.5"

- -               target="1.5">

- +               source="1.6"

- +               target="1.6">

-              <include name="com/mysql/jdbc/log/Log4JLogger.java" />

-              <classpath refid="project.build.classpath" />

-          </javac>

- @@ -1791,7 +1737,7 @@

-              <sysproperty key="com.mysql.fabric.testsuite.shard2.port" value="${com.mysql.fabric.testsuite.shard2.port}" />

-  

-              <classpath>

- -                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate4">

- +                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate">

-                      <include name="**/*.jar" />

-                  </fileset>

-                  <fileset dir="${buildDir}/${fullProdName}/lib">

- @@ -1878,7 +1824,7 @@

-              <sysproperty key="com.mysql.fabric.testsuite.shard2.port" value="${com.mysql.fabric.testsuite.shard2.port}" />

-  

-              <classpath>

- -                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate4">

- +                <fileset dir="${com.mysql.jdbc.extra.libs}/hibernate">

-                      <include name="**/*.jar" />

-                  </fileset>

-                  <fileset dir="src/lib">

@@ -1,2046 +0,0 @@ 

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java

- --- mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java	2015-12-08 09:26:50.490672588 +0100

- @@ -23,13 +23,20 @@

-  

-  package com.mysql.fabric.jdbc;

-  

- +import java.sql.Blob;

-  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.Statement;

- +import java.sql.Struct;

-  import java.util.ArrayList;

-  import java.util.Calendar;

-  import java.util.Collections;

- @@ -3057,4 +3064,42 @@

-  

-      public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException {

-      }

- +

- +    @Override

- +    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(String name, String value) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public void setClientInfo(Properties properties) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public SQLXML createSQLXML() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob createNClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Blob createBlob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Clob createClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java

- --- mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java	2015-12-08 09:52:57.887620213 +0100

- @@ -28,6 +28,7 @@

-  import java.sql.Driver;

-  import java.sql.DriverManager;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.util.Properties;

-  import java.util.logging.Logger;

-  

- @@ -103,7 +104,7 @@

-          return super.parseURL(url.replaceAll("fabric:", ""), defaults);

-      }

-  

- -    public Logger getParentLogger() throws SQLException {

- -        throw new SQLException("no logging");

- +    public Logger getParentLogger() throws SQLFeatureNotSupportedException {

- +        throw new SQLFeatureNotSupportedException("no logging");

-      }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/CallableStatement.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/CallableStatement.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java	2015-12-08 09:29:38.286340453 +0100

- @@ -33,10 +33,14 @@

-  import java.sql.Blob;

-  import java.sql.Clob;

-  import java.sql.Date;

- +import java.sql.NClob;

-  import java.sql.ParameterMetaData;

-  import java.sql.Ref;

-  import java.sql.ResultSet;

- +import java.sql.RowId;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

-  import java.sql.Time;

-  import java.sql.Timestamp;

-  import java.sql.Types;

- @@ -2417,4 +2421,94 @@

-  

-          return super.executeLargeBatch();

-      }

- +

- +    @Override

- +    public void setNClob(String parameterName, NClob value) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(String parameterName, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Reader getCharacterStream(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Reader getCharacterStream(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Reader getNCharacterStream(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Reader getNCharacterStream(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getNString(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getNString(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML getSQLXML(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML getSQLXML(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob getNClob (int parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob getNClob (String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNString(String parameterName, String value) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setRowId(String parameterName, RowId x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowId getRowId(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowId getRowId(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ConnectionImpl.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ConnectionImpl.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java	2015-12-08 09:32:01.909242622 +0100

- @@ -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;

-  import java.sql.SQLWarning;

- -import java.sql.Savepoint;

- +import java.sql.SQLClientInfoException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

- +import java.sql.Struct;

-  import java.util.ArrayList;

-  import java.util.Calendar;

-  import java.util.Collections;

- @@ -5587,4 +5592,69 @@

-      public void setProfilerEventHandlerInstance(ProfilerEventHandler h) {

-          this.eventSink = h;

-      }

- +

- +    @Override

- +    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getClientInfo(String name) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Properties getClientInfo() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(String name, String value) throws SQLClientInfoException {

- +        //throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(Properties properties) throws SQLClientInfoException {

- +        //throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isValid(int timeout) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML createSQLXML() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob createNClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Blob createBlob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Clob createClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/DatabaseMetaData.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/DatabaseMetaData.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java	2015-12-08 09:34:19.920447597 +0100

- @@ -30,7 +30,9 @@

-  import java.lang.reflect.Constructor;

-  import java.sql.PreparedStatement;

-  import java.sql.ResultSet;

- +import java.sql.RowIdLifetime;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.sql.Statement;

-  import java.sql.Types;

-  import java.util.ArrayList;

- @@ -7889,4 +7891,24 @@

-      public boolean generatedKeyAlwaysReturned() throws SQLException {

-          return true;

-      }

- +

- +    @Override

- +    public boolean autoCommitFailureClosesAllResultSets() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowIdLifetime getRowIdLifetime() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java	2015-12-08 10:01:06.280718457 +0100

- @@ -33,8 +33,12 @@

-  import java.sql.CallableStatement;

-  import java.sql.Clob;

-  import java.sql.Date;

- +import java.sql.NClob;

-  import java.sql.Ref;

- +import java.sql.RowId;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

-  import java.sql.Time;

-  import java.sql.Timestamp;

-  import java.util.Calendar;

- @@ -2347,4 +2351,169 @@

-      //		throw SQLError.createSQLFeatureNotSupportedException();

-      //	}

-  

- +    @Override

- +    public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T getObject(String parameterName, Class<T> type) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBlob(String parameterName, InputStream inputStream) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClob(String parameterName, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNCharacterStream(String parameterName, Reader value) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException {

- +    	throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClob (String parameterName, Clob x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBlob (String parameterName, Blob x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.io.Reader getCharacterStream(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.io.Reader getNCharacterStream(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getNString(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getNString(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML getSQLXML(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML getSQLXML(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob getNClob (String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob getNClob (int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(String parameterName, Reader reader, long length) throws SQLException  {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBlob(String parameterName, InputStream inputStream, long length)	throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClob(String parameterName, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(String parameterName, NClob value) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNString(String parameterName, String value) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setRowId(String parameterName, RowId x) throws SQLException  {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowId getRowId(String parameterName) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowId getRowId(int parameterIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java	2015-12-08 10:06:11.618782682 +0100

- @@ -24,9 +24,16 @@

-  package com.mysql.jdbc.jdbc2.optional;

-  

-  import java.lang.reflect.Constructor;

- -import java.sql.SQLException;

- +import java.sql.Blob;

- +import java.sql.Clob;

- +import java.sql.NClob;

-  import java.sql.Savepoint;

- +import java.sql.SQLException;

- +import java.sql.SQLClientInfoException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

-  import java.sql.Statement;

- +import java.sql.Struct;

-  import java.util.Map;

-  import java.util.Properties;

-  import java.util.TimeZone;

- @@ -2872,4 +2879,68 @@

-      public boolean isUseSSLExplicit() {

-          return this.mc.isUseSSLExplicit();

-      }

- +

- +    @Override

- +    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getClientInfo(String name) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Properties getClientInfo() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +    @Override

- +    public void setClientInfo(String name, String value) throws SQLClientInfoException {

- +        //throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(Properties properties) throws SQLClientInfoException {

- +        //throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isValid(int timeout) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML createSQLXML() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob createNClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Blob createBlob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Clob createClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java	2015-12-08 11:41:21.269740381 +0100

- @@ -25,6 +25,9 @@

-  

-  import java.sql.Connection;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +

- +import java.util.logging.Logger;

-  

-  import javax.sql.ConnectionPoolDataSource;

-  import javax.sql.PooledConnection;

- @@ -69,4 +72,10 @@

-  

-          return mysqlPooledConnection;

-      }

- +

- +    @Override

- +    public Logger getParentLogger() throws SQLFeatureNotSupportedException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java	2015-12-08 10:47:50.251616360 +0100

- @@ -26,8 +26,10 @@

-  import java.io.PrintWriter;

-  import java.io.Serializable;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.util.Iterator;

-  import java.util.Properties;

- +import java.util.logging.Logger;

-  

-  import javax.naming.NamingException;

-  import javax.naming.Reference;

- @@ -429,4 +431,19 @@

-      //	public <T> T unwrap(Class<T> iface) throws SQLException {

-      //		throw SQLError.createSQLFeatureNotSupportedException();

-      //	}

- +

- +    @Override

- +    public Logger getParentLogger() throws SQLFeatureNotSupportedException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java	2015-12-08 11:40:57.780887627 +0100

- @@ -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 javax.sql.StatementEventListener;

-  

-  import com.mysql.jdbc.ExceptionInterceptor;

-  import com.mysql.jdbc.SQLError;

- @@ -230,4 +232,12 @@

-      protected ExceptionInterceptor getExceptionInterceptor() {

-          return this.exceptionInterceptor;

-      }

- -}

- \ Manca newline alla fine del file

- +

- +    @Override

- +    public void addStatementEventListener(StatementEventListener listener) {}

- +

- +    @Override

- +    public void removeStatementEventListener(StatementEventListener listener) {}

- +

- +

- +}

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java	2015-12-08 10:20:13.352619255 +0100

- @@ -27,6 +27,7 @@

-  import java.sql.Connection;

-  import java.sql.ResultSet;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.sql.Statement;

-  import java.util.ArrayList;

-  import java.util.Collections;

- @@ -34,6 +35,7 @@

-  import java.util.List;

-  import java.util.Map;

-  

- +import javax.sql.StatementEventListener;

-  import javax.sql.XAConnection;

-  import javax.transaction.xa.XAException;

-  import javax.transaction.xa.XAResource;

- @@ -612,4 +614,10 @@

-  

-          return connToWrap;

-      }

- +

- +    @Override

- +    public void addStatementEventListener(StatementEventListener listener) {}

- +

- +    @Override

- +    public void removeStatementEventListener(StatementEventListener listener) {}

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java	2015-12-08 11:41:10.622260427 +0100

- @@ -25,6 +25,9 @@

-  

-  import java.sql.Connection;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +

- +import java.util.logging.Logger;

-  

-  import javax.sql.XAConnection;

-  

- @@ -69,4 +72,11 @@

-  

-          return MysqlXAConnection.getInstance((com.mysql.jdbc.Connection) conn, getLogXaCommands());

-      }

- -}

- \ Manca newline alla fine del file

- +

- +    @Override

- +    public Logger getParentLogger() throws SQLFeatureNotSupportedException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +

- +}

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java	2015-12-08 09:58:13.636163459 +0100

- @@ -32,12 +32,16 @@

-  import java.sql.Blob;

-  import java.sql.Clob;

-  import java.sql.Date;

- +import java.sql.NClob;

-  import java.sql.ParameterMetaData;

-  import java.sql.PreparedStatement;

-  import java.sql.Ref;

-  import java.sql.ResultSet;

-  import java.sql.ResultSetMetaData;

- +import java.sql.RowId;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

-  import java.sql.Time;

-  import java.sql.Timestamp;

-  import java.util.Calendar;

- @@ -1103,4 +1107,106 @@

-  

-          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");

- +    }

- +

- +    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void setNClob(String parameterName, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(int parameterName, NClob value) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(int parameterName, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(int parameterName, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClob(int parameterIndex, Reader reader) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNString(int parameterIndex, String value) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setRowId(int parameterIndex, RowId x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java	2015-12-08 09:55:34.640943754 +0100

- @@ -27,6 +27,7 @@

-  import java.sql.Connection;

-  import java.sql.ResultSet;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.sql.SQLWarning;

-  import java.sql.Statement;

-  

- @@ -910,4 +911,39 @@

-              checkAndFireConnectionError(sqlEx);

-          }

-      }

- +

- +    @Override

- +    public boolean isCloseOnCompletion() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void closeOnCompletion() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isPoolable()  throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setPoolable(boolean poolable) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isClosed() throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java	2015-12-08 10:21:38.622450562 +0100

- @@ -25,9 +25,11 @@

-  

-  import java.lang.reflect.Constructor;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.util.HashMap;

-  import java.util.Map;

-  

- +import javax.sql.StatementEventListener;

-  import javax.sql.XAConnection;

-  import javax.transaction.xa.XAException;

-  import javax.transaction.xa.XAResource;

- @@ -199,4 +201,10 @@

-              this.currentXAConnection.close();

-          }

-      }

- +

- +    @Override

- +    public void addStatementEventListener(StatementEventListener listener) {}

- +

- +    @Override

- +    public void removeStatementEventListener(StatementEventListener listener) {}

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4Connection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4Connection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java	2015-12-08 10:29:24.516673808 +0100

- @@ -27,11 +27,13 @@

-  import java.sql.Clob;

-  import java.sql.SQLClientInfoException;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.sql.SQLXML;

-  import java.sql.NClob;

-  import java.sql.Struct;

-  import java.util.Properties;

-  import java.util.TimerTask;

- +import java.util.concurrent.Executor;

-  

-  import com.mysql.jdbc.ConnectionImpl;

-  import com.mysql.jdbc.Messages;

- @@ -197,7 +199,7 @@

-      /**

-       * @see java.sql.Connection#createClob()

-       */

- -    public Clob createClob() {

- +    public com.mysql.jdbc.Clob createClob() throws SQLException {

-          return new com.mysql.jdbc.Clob(getExceptionInterceptor());

-      }

-  

- @@ -233,4 +235,24 @@

-              return this.infoProvider;

-          }

-      }

- +

- +    public int getNetworkTimeout() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void setNetworkTimeout(Executor executor, int millis) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void abort(Executor executor) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public String getSchema() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void setSchema(String schema) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java	2015-12-08 10:35:39.864323718 +0100

- @@ -27,11 +27,13 @@

-  import java.sql.Clob;

-  import java.sql.SQLClientInfoException;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.sql.SQLXML;

-  import java.sql.NClob;

-  import java.sql.Struct;

-  import java.util.Properties;

-  import java.util.TimerTask;

- +import java.util.concurrent.Executor;

-  

-  import com.mysql.jdbc.ConnectionImpl;

-  import com.mysql.jdbc.LoadBalancedMySQLConnection;

- @@ -100,21 +102,24 @@

-      /**

-       * @see java.sql.Connection#createBlob()

-       */

- -    public Blob createBlob() {

- +    @Override

- +    public Blob createBlob() throws SQLException {

-          return this.getJDBC4Connection().createBlob();

-      }

-  

-      /**

-       * @see java.sql.Connection#createClob()

-       */

- -    public Clob createClob() {

- +    @Override

- +    public Clob createClob() throws SQLException {

-          return this.getJDBC4Connection().createClob();

-      }

-  

-      /**

-       * @see java.sql.Connection#createNClob()

-       */

- -    public NClob createNClob() {

- +    @Override

- +    public NClob createNClob() throws SQLException {

-          return this.getJDBC4Connection().createNClob();

-      }

-  

- @@ -123,4 +128,24 @@

-              return this.getJDBC4Connection().getClientInfoProviderImpl();

-          }

-      }

- +

- +    public int getNetworkTimeout() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void setNetworkTimeout(Executor executor, int millis) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void abort(Executor executor) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public String getSchema() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    public void setSchema(String schema) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java	2015-12-08 10:40:11.658036198 +0100

- @@ -109,7 +109,7 @@

-      /**

-       * @see java.sql.Connection#createClob()

-       */

- -    public Clob createClob() {

- +    public Clob createClob() throws SQLException {

-          return this.getJDBC4Connection().createClob();

-      }

-  

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java	2015-12-08 10:32:18.950146061 +0100

- @@ -59,11 +59,14 @@

-  

-      public <T> T unwrap(java.lang.Class<T> iface) throws java.sql.SQLException;

-  

- -    public Blob createBlob();

- +    @Override

- +    public Blob createBlob() throws SQLException;

-  

- -    public Clob createClob();

- +    @Override

- +    public Clob createClob() throws SQLException;

-  

- -    public NClob createNClob();

- +    @Override

- +    public NClob createNClob() throws SQLException;

-      

-      /*

-       * Non standard methods:

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java	2015-12-08 10:42:43.205627302 +0100

- @@ -100,21 +100,21 @@

-      /**

-       * @see java.sql.Connection#createBlob()

-       */

- -    public Blob createBlob() {

- +    public Blob createBlob() throws SQLException {

-          return this.getJDBC4Connection().createBlob();

-      }

-  

-      /**

-       * @see java.sql.Connection#createClob()

-       */

- -    public Clob createClob() {

- +    public Clob createClob() throws SQLException {

-          return this.getJDBC4Connection().createClob();

-      }

-  

-      /**

-       * @see java.sql.Connection#createNClob()

-       */

- -    public NClob createNClob() {

- +    public NClob createNClob() throws SQLException {

-          return this.getJDBC4Connection().createNClob();

-      }

-  

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java	2015-12-08 09:43:09.373440687 +0100

- @@ -23,7 +23,16 @@

-  

-  package com.mysql.jdbc;

-  

- +import java.sql.Array;

- +import java.sql.Blob;

- +import java.sql.Clob;

- +import java.sql.NClob;

- +import java.sql.SQLClientInfoException;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

- +import java.sql.Struct;

- +import java.util.Properties;

-  

-  public class LoadBalancedMySQLConnection extends MultiHostMySQLConnection implements LoadBalancedConnection {

-  

- @@ -65,4 +74,67 @@

-      public void removeHostWhenNotInUse(String host) throws SQLException {

-          getThisAsProxy().removeHostWhenNotInUse(host);

-      }

- +

- +    @Override

- +    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getClientInfo(String name) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Properties getClientInfo() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(Properties properties) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public void setClientInfo(String name, String value) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public boolean isValid(int timeout) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML createSQLXML() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob createNClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Blob createBlob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Clob createClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/MultiHostMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/MultiHostMySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java	2015-12-08 09:40:49.551288000 +0100

- @@ -23,13 +23,21 @@

-  

-  package com.mysql.jdbc;

-  

- +import java.sql.Array;

- +import java.sql.Blob;

-  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.Statement;

- +import java.sql.Struct;

-  import java.util.Calendar;

-  import java.util.List;

-  import java.util.Map;

- @@ -2467,4 +2475,67 @@

-      public boolean isUseSSLExplicit() {

-          return getActiveMySQLConnection().isUseSSLExplicit();

-      }

- +

- +    @Override

- +    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getClientInfo(String name) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Properties getClientInfo() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(Properties properties) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public void setClientInfo(String name, String value) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public boolean isValid(int timeout) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML createSQLXML() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob createNClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Blob createBlob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Clob createClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/NonRegisteringDriver.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/NonRegisteringDriver.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java	2015-12-08 09:48:44.474030279 +0100

- @@ -31,6 +31,7 @@

-  import java.net.URLDecoder;

-  import java.sql.DriverPropertyInfo;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.util.ArrayList;

-  import java.util.Iterator;

-  import java.util.List;

- @@ -38,6 +39,7 @@

-  import java.util.Properties;

-  import java.util.StringTokenizer;

-  import java.util.concurrent.ConcurrentHashMap;

- +import java.util.logging.Logger;

-  

-  /**

-   * The Java SQL framework allows for multiple database drivers. Each driver should supply a class that implements the Driver interface

- @@ -900,4 +902,9 @@

-              }

-          }

-      }

- +

- +    @Override

- +    public Logger getParentLogger() throws SQLFeatureNotSupportedException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/PreparedStatement.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/PreparedStatement.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java	2015-12-08 09:18:58.861657157 +0100

- @@ -43,9 +43,13 @@

-  import java.sql.Clob;

-  import java.sql.DatabaseMetaData;

-  import java.sql.Date;

- +import java.sql.NClob;

-  import java.sql.ParameterMetaData;

-  import java.sql.Ref;

- +import java.sql.RowId;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

-  import java.sql.Time;

-  import java.sql.Timestamp;

-  import java.sql.Types;

- @@ -5093,4 +5097,19 @@

-      public long executeLargeUpdate() throws SQLException {

-          return executeUpdateInternal(true, false);

-      }

- +

- +    @Override

- +    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException{

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setNClob(int parameterIndex, NClob value) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setRowId(int parameterIndex, RowId x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ReplicationMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ReplicationMySQLConnection.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java	2015-12-08 09:46:47.726747579 +0100

- @@ -23,7 +23,16 @@

-  

-  package com.mysql.jdbc;

-  

- +import java.sql.Array;

- +import java.sql.Blob;

- +import java.sql.Clob;

- +import java.sql.NClob;

- +import java.sql.SQLClientInfoException;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

- +import java.sql.SQLXML;

- +import java.sql.Struct;

- +import java.util.Properties;

-  import java.util.Properties;

-  import java.util.concurrent.Executor;

-  

- @@ -173,4 +182,67 @@

-      public void setProxy(MySQLConnection proxy) {

-          getThisAsProxy().setProxy(proxy);

-      }

- +

- +    @Override

- +    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getClientInfo(String name) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Properties getClientInfo() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void setClientInfo(Properties properties) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public void setClientInfo(String name, String value) throws SQLClientInfoException {

- +    }

- +

- +    @Override

- +    public boolean isValid(int timeout) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML createSQLXML() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob createNClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Blob createBlob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Clob createClob() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ResultSetImpl.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java

- --- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ResultSetImpl.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java	2015-12-08 09:22:34.388389716 +0100

- @@ -27,6 +27,7 @@

-  import java.io.IOException;

-  import java.io.InputStream;

-  import java.io.ObjectInputStream;

- +import java.io.Reader;

-  import java.io.StringReader;

-  import java.io.UnsupportedEncodingException;

-  import java.lang.reflect.Constructor;

- @@ -36,9 +37,13 @@

-  import java.net.URL;

-  import java.sql.Array;

-  import java.sql.Date;

- +import java.sql.NClob;

-  import java.sql.Ref;

- +import java.sql.RowId;

-  import java.sql.SQLException;

- +import java.sql.SQLFeatureNotSupportedException;

-  import java.sql.SQLWarning;

- +import java.sql.SQLXML;

-  import java.sql.Time;

-  import java.sql.Timestamp;

-  import java.sql.Types;

- @@ -7923,4 +7928,249 @@

-      protected ExceptionInterceptor getExceptionInterceptor() {

-          return this.exceptionInterceptor;

-      }

- +

- +    @Override

- +    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    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 {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    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 {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateClob(int columnIndex, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    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 {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Reader getNCharacterStream(int columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public Reader getNCharacterStream(String columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getNString(int columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public String getNString(String columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML getSQLXML(int columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public SQLXML getSQLXML(String columnLabel) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob getNClob(int columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public NClob getNClob(String columnLabel) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNClob(String columnLabel,  NClob nClob) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNString(String columnLabel, String nString) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateNString(int columnLabel, String nString) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public int getHoldability() throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateRowId(int columnIndex, RowId x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public void updateRowId(String columnLabel, RowId x) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowId getRowId(int columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public RowId getRowId(String columnIndex) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

- +

- +    @Override

- +    public <T> T unwrap(Class<T> iface) throws SQLException {

- +        throw new SQLFeatureNotSupportedException("Not supported");

- +    }

-  }

- diff -Nru mysql-connector-j-5.1.38/src/testsuite/regression/StatementRegressionTest.java mysql-connector-j-5.1.38.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java

- --- mysql-connector-j-5.1.38/src/testsuite/regression/StatementRegressionTest.java	2015-12-02 02:13:22.000000000 +0100

- +++ mysql-connector-j-5.1.38.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java	2015-12-08 10:53:58.790597660 +0100

- @@ -47,12 +47,16 @@

-  import java.sql.Connection;

-  import java.sql.DataTruncation;

-  import java.sql.Date;

- +import java.sql.NClob;

-  import java.sql.PreparedStatement;

-  import java.sql.Ref;

-  import java.sql.ResultSet;

-  import java.sql.ResultSetMetaData;

- +import java.sql.RowId;

-  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;

- @@ -2264,7 +2268,8 @@

-  

-          try {

-              pStmt = this.conn.prepareStatement("INSERT INTO testNullClob VALUES (?)");

- -            pStmt.setClob(1, null);

- +            Clob x = null;

- +            pStmt.setClob(1, x);

-              pStmt.executeUpdate();

-          } finally {

-              if (pStmt != null) {

- @@ -4542,6 +4547,261 @@

-              public int getBytesSize() throws SQLException {

-                  return 0;

-              }

- +

- +            @Override

- +            public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNClob(int columnIndex, NClob nClob) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            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 {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            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 {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateClob(int columnIndex, Reader reader) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            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 {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public Reader getNCharacterStream(int columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public Reader getNCharacterStream(String columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public String getNString(int columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public String getNString(String columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public SQLXML getSQLXML(int columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public SQLXML getSQLXML(String columnLabel) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public NClob getNClob(int columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public NClob getNClob(String columnLabel) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNClob(String columnLabel, NClob nClob) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNString(String columnLabel, String nString) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateNString(int columnLabel, String nString) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public int getHoldability() throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateRowId(int columnIndex, RowId x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public void updateRowId(String columnLabel, RowId x) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public RowId getRowId(int columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public RowId getRowId(String columnIndex) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public boolean isWrapperFor(Class<?> iface) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

- +

- +            @Override

- +            public <T> T unwrap(Class<T> iface) throws SQLException {

- +                throw new SQLFeatureNotSupportedException("Not supported");

- +            }

-          };

-      }

-  

@@ -1,41 +0,0 @@ 

- diff -up --recursive mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java

- --- mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java	2015-06-19 21:26:19.000000000 +0200

- +++ mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java	2015-07-14 17:07:23.750395725 +0200

- @@ -27,7 +27,7 @@ import java.sql.Connection;

-  import java.sql.DriverManager;

-  import java.sql.SQLException;

-  

- -import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;

- +import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;

-  

-  import com.mysql.fabric.FabricCommunicationException;

-  import com.mysql.fabric.FabricConnection;

- diff -up --recursive mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java

- --- mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java	2015-06-19 21:26:20.000000000 +0200

- +++ mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java	2015-07-14 17:14:19.676360531 +0200

- @@ -30,7 +30,7 @@ import java.sql.Statement;

-  import org.hibernate.Session;

-  import org.hibernate.SessionFactory;

-  import org.hibernate.cfg.Configuration;

- -import org.hibernate.service.ServiceRegistryBuilder;

- +import org.hibernate.boot.registry.StandardServiceRegistryBuilder;

-  

-  import com.mysql.fabric.hibernate.FabricMultiTenantConnectionProvider;

-  

- @@ -107,13 +107,13 @@ public class HibernateFabric {

-          // creating this here allows passing needed params to the constructor

-          FabricMultiTenantConnectionProvider connProvider = new FabricMultiTenantConnectionProvider(fabricUrl, "employees", "employees", username, password,

-                  fabricUser, fabricPassword);

- -        ServiceRegistryBuilder srb = new ServiceRegistryBuilder();

- -        srb.addService(org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider);

- +        StandardServiceRegistryBuilder srb = new StandardServiceRegistryBuilder();

- +        srb.addService(org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider);

-          srb.applySetting("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect");

-  

-          Configuration config = new Configuration();

-          config.setProperty("hibernate.multiTenancy", "DATABASE");

-          config.addResource("com/mysql/fabric/demo/employee.hbm.xml");

- -        return config.buildSessionFactory(srb.buildServiceRegistry());

- +        return config.buildSessionFactory(srb.build());

-      }

-  }

file modified
+31 -32
@@ -1,10 +1,8 @@ 

- %global     builddir        build-mysql-jdbc

- %global     distdir         dist-mysql-jdbc

  

  Summary:       Official JDBC driver for MySQL

  Name:          mysql-connector-java

- Version:       5.1.38

- Release:       7%{?dist}

+ Version:       8.0.12

+ Release:       1%{?dist}

  Epoch:         1

  License:       GPLv2 with exceptions

  URL:           http://dev.mysql.com/downloads/connector/j/
@@ -19,11 +17,12 @@ 

  # Following prebuilt jars and sources have been removed from the tarball:

  #

  # %%{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

- # src/lib/jboss-common-jdbc-wrapper-src.jar

- # src/lib/slf4j-api-1.6.1.jar

+ # lib/c3p0-0.9.1-pre6.jar

+ # lib/c3p0-0.9.1-pre6.src.zip

+ # lib/jboss-common-jdbc-wrapper.jar

+ # lib/jboss-common-jdbc-wrapper-src.jar

+ # lib/protobuf-java-2.6.0.jar

+ # lib/slf4j-api-1.6.1.jar

  #

  # See http://bugs.mysql.com/bug.php?id=28512 for details.

  
@@ -31,16 +30,14 @@ 

  # ./generate-tarball.sh version

  # will create a new tarball compressed with xz and without those jar files.

  Source1:       generate-tarball.sh

- # Patch to build with JDBC 4.1/Java 7

- Patch0:        %{name}-5.1.38-jdbc4.1.patch

- # Add system libraries

- Patch1:        %{name}-5.1.38-build.patch

- Patch2:        %{name}-hibernate.patch

+ Patch3:        java-version-detection.patch

+ Patch4:        remove-coverage-test.patch

  

  BuildArch:     noarch

  

  BuildRequires: ant >= 1.6.0

  BuildRequires: ant-contrib >= 1.0

+ BuildRequires: ant-junit

  BuildRequires: apache-commons-logging

  BuildRequires: c3p0

  BuildRequires: git
@@ -49,6 +46,7 @@ 

  BuildRequires: javapackages-local

  BuildRequires: jta >= 1.0

  BuildRequires: junit

+ BuildRequires: protobuf-java

  BuildRequires: slf4j

  

  Requires:      jta >= 1.0
@@ -73,11 +71,10 @@ 

   rm $file.orig

  done

  

- sed -i 's/>@.*</>%{version}</' src/doc/sources/pom.xml

+ sed -i 's/>@.*</>%{version}</' src/build/misc/pom.xml

  

- %patch0 -p1

- %patch1 -p1

- %patch2 -p1

+ %patch3 -p1

+ %patch4 -p1

  

  %build

  
@@ -86,30 +83,32 @@ 

  

  # We currently need to disable jboss integration because of missing jboss-common-jdbc-wrapper.jar (built from sources).

  # See BZ#480154 and BZ#471915 for details.

- rm -rf src/com/mysql/jdbc/integration/jboss

- rm src/testsuite/regression/ConnectionRegressionTest.java

- rm src/testsuite/regression/DataSourceRegressionTest.java

- rm src/testsuite/regression/jdbc4/ConnectionRegressionTest.java

- rm src/testsuite/simple/ReadOnlyCallableStatementTest.java

- rm src/testsuite/simple/jdbc4/StatementsTest.java

- 

- ant -DbuildDir=%{builddir} -DdistDir=%{distdir} \

-     -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

+ rm -rf src/main/user-impl/java/com/mysql/cj/jdbc/integration/jboss

+ rm src/test/java/testsuite/regression/ConnectionRegressionTest.java

+ rm src/test/java/testsuite/regression/DataSourceRegressionTest.java

+ rm src/test/java/testsuite/simple/StatementsTest.java

+ 

+ ant -Dcom.mysql.cj.build.jdk=%{java_home} \

+     -Dcom.mysql.cj.extra.libs=/usr/share/java \

+     test dist

  

  %install

  # Install the Maven build information

  %mvn_file mysql:mysql-connector-java %{name}

- %mvn_artifact src/doc/sources/pom.xml build-mysql-jdbc/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT-bin.jar

+ %mvn_artifact src/build/misc/pom.xml build/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar

  %mvn_install

  

  %files -f .mfiles

  %doc CHANGES README README.md

- %license COPYING

+ %license LICENSE

  

  %changelog

+ * Tue Aug 07 2018 Jakub Janco <jjanco@redhat.com> - 1:8.0.12-1

+ - new version

+ 

+ * Wed May 23 2018 Jakub Janco <jjanco@redhat.com> - 1:8.0.11-1

+ - new version

+ 

  * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.1.38-7

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

@@ -0,0 +1,75 @@ 

+ From 61336321d9dbd5628c24e51782cdc7e155a3b485 Mon Sep 17 00:00:00 2001

+ From: Jakub Janco <jjanco@redhat.com>

+ Date: Thu, 12 Jul 2018 14:32:54 +0200

+ Subject: [PATCH] Remove coverage testing

+ 

+ ---

+  build.xml | 52 ----------------------------------------------------

+  1 file changed, 52 deletions(-)

+ 

+ diff --git a/build.xml b/build.xml

+ index 659baaca..907585c4 100644

+ --- a/build.xml

+ +++ b/build.xml

+ @@ -1179,58 +1179,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o

+          </condition>

+          <echo>${com.mysql.cj.testsuite.message.test.mode}</echo>

+  

+ -        <local name="com.mysql.cj.testsuite.test.coverage" />

+ -        <condition property="com.mysql.cj.testsuite.test.coverage" value="true" else="false">

+ -            <isset property="com.mysql.cj.coverage.result.dir.final" />

+ -        </condition>

+ -

+ -        <jacoco:coverage destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"

+ -                         enabled="${com.mysql.cj.testsuite.test.coverage}">

+ -            <junit printsummary="yes"

+ -                   fork="on"

+ -                   forkmode="once"

+ -                   jvm="${com.mysql.cj.testsuite.jvm.java}"

+ -                   errorProperty="com.mysql.cj.testsuite.junit.fail"

+ -                   failureProperty="com.mysql.cj.testsuite.junit.fail">

+ -                <jvmarg value="-Xmx1024m" />

+ -

+ -                <syspropertyset refid="junit.system.properties" />

+ -                <sysproperty key="com.mysql.cj.testsuite.url" value="${com.mysql.cj.testsuite.url}" />

+ -

+ -                <classpath>

+ -                    <fileset dir="${com.mysql.cj.extra.libs}">

+ -                        <include name="**/*.jar" />

+ -                    </fileset>

+ -                    <fileset dir="${com.mysql.cj.build.dir.driver}/lib">

+ -                        <include name="**/*.jar" />

+ -                    </fileset>

+ -                    <pathelement location="${com.mysql.cj.build.dir.driver}" />

+ -                    <pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />

+ -                    <pathelement path="${com.mysql.cj.testsuite.build.classpath}" />

+ -                    <pathelement path="${java.class.path}" />

+ -                </classpath>

+ -

+ -                <formatter type="xml" />

+ -

+ -                <test if="${com.mysql.cj.testsuite.test.methods.enabled}"

+ -                      name="${com.mysql.cj.testsuite.test.class}"

+ -                      methods="${com.mysql.cj.testsuite.test.methods}"

+ -                      todir="${com.mysql.cj.testsuite.junit.results}" />

+ -

+ -                <test if="com.mysql.cj.testsuite.test.class"

+ -                      unless="com.mysql.cj.testsuite.test.methods"

+ -                      name="${com.mysql.cj.testsuite.test.class}"

+ -                      todir="${com.mysql.cj.testsuite.junit.results}" />

+ -

+ -                <batchtest unless="com.mysql.cj.testsuite.test.class" todir="${com.mysql.cj.testsuite.junit.results}">

+ -                    <fileset dir="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}">

+ -                        <include name="**/*Test.java" />

+ -                        <exclude name="**/perf/*.java" />

+ -                    </fileset>

+ -                </batchtest>

+ -            </junit>

+ -        </jacoco:coverage>

+ -

+          <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">

+              <fileset dir="${com.mysql.cj.testsuite.junit.results}">

+                  <include name="**/TEST-*.xml" />

+ -- 

+ 2.14.3

+ 

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 5046a52bd83db0606aed412735f9abfd  mysql-connector-java-5.1.38-nojars.tar.xz

+ SHA512 (mysql-connector-java-8.0.12-nojars.tar.xz) = fc656aab499e4978509bc020c16049b87ee5edeb2920be5ed1fff5676c71ad9218176120d48b50dbe90e0c32eb1f2df980e86c4e7d3e6935f40851f2826c57b1

LGTM at the first glance.

What about Source0 vs Source1?
Im not sure if this source1 was even used in previous version.

rebased onto d7dbeba

5 years ago

Fixed sources tarball. Now it is regenerated by generate-tarball.sh

rebased onto ffd45e2

5 years ago

Hello, what about pushing this into testing?

rebased onto 5dec824

5 years ago

rebased onto acb9c8f

5 years ago

rebased onto 50eb2b6

5 years ago

rebased onto 821df2f

5 years ago

1 new commit added

  • new version 8.0.12
5 years ago

Will merge this week because of no negative feedback.

I still wasn't able to update community-mysql to 8.0.12, because of some DWARF errors.
And I'm not sure if there isn't some version dependency between the mysql and its connectors. (both buildtime and runtime)

IMHO it's not a big problem (If you tested it and it works fine). Just saying.

That may be a good question to the upstream.

rebased onto 810021c

5 years ago

Pull-Request has been merged by jjanco

5 years ago