[pkg-java] r17995 - trunk/mysql-connector-java/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Apr 7 05:46:37 UTC 2014
Author: ebourg-guest
Date: 2014-04-07 05:46:37 +0000 (Mon, 07 Apr 2014)
New Revision: 17995
Modified:
trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch
Log:
Refreshed the patches
Modified: trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch 2014-04-07 05:45:46 UTC (rev 17994)
+++ trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch 2014-04-07 05:46:37 UTC (rev 17995)
@@ -8,7 +8,7 @@
--- a/build.xml
+++ b/build.xml
-@@ -800,7 +800,7 @@
+@@ -823,7 +823,7 @@
</target>
Modified: trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2014-04-07 05:45:46 UTC (rev 17994)
+++ trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2014-04-07 05:46:37 UTC (rev 17995)
@@ -3,7 +3,7 @@
Author: Emmanuel Bourg <ebourg at apache.org>
--- a/src/com/mysql/jdbc/CallableStatement.java
+++ b/src/com/mysql/jdbc/CallableStatement.java
-@@ -426,11 +426,11 @@
+@@ -427,11 +427,11 @@
* @throws java.sql.SQLException If no object found that implements the interface
* @since 1.6
*/
@@ -17,7 +17,7 @@
} catch (ClassCastException cce) {
throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(),
SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor());
-@@ -2670,4 +2670,76 @@
+@@ -2671,4 +2671,76 @@
}
}
}
@@ -96,7 +96,7 @@
}
--- a/src/com/mysql/jdbc/ConnectionImpl.java
+++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -6140,4 +6140,56 @@
+@@ -6112,4 +6112,56 @@
return getSocketTimeout();
}
}
@@ -155,7 +155,7 @@
}
--- a/src/com/mysql/jdbc/DatabaseMetaData.java
+++ b/src/com/mysql/jdbc/DatabaseMetaData.java
-@@ -8832,4 +8832,20 @@
+@@ -8839,4 +8839,20 @@
throws SQLException {
return true;
}
@@ -178,7 +178,7 @@
}
--- a/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java
+++ b/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java
-@@ -2674,6 +2674,58 @@
+@@ -2662,6 +2662,58 @@
}
@@ -239,7 +239,7 @@
}
--- a/src/com/mysql/jdbc/MysqlParameterMetadata.java
+++ b/src/com/mysql/jdbc/MysqlParameterMetadata.java
-@@ -202,11 +202,11 @@
+@@ -201,11 +201,11 @@
* @throws java.sql.SQLException If no object found that implements the interface
* @since 1.6
*/
@@ -255,7 +255,7 @@
SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor);
--- a/src/com/mysql/jdbc/NonRegisteringDriver.java
+++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
-@@ -1004,4 +1004,8 @@
+@@ -1001,4 +1001,8 @@
}
}
}
@@ -266,7 +266,7 @@
}
--- a/src/com/mysql/jdbc/PreparedStatement.java
+++ b/src/com/mysql/jdbc/PreparedStatement.java
-@@ -5740,4 +5740,16 @@
+@@ -5632,4 +5632,16 @@
statementStartPos, sql, "SELECT", "\"'`",
"\"'`", false) == -1 && rewritableOdku;
}
@@ -285,9 +285,9 @@
}
--- a/src/com/mysql/jdbc/ReplicationConnection.java
+++ b/src/com/mysql/jdbc/ReplicationConnection.java
-@@ -2978,4 +2978,56 @@
- public boolean getDetectCustomCollations() {
- return getCurrentConnection().getDetectCustomCollations();
+@@ -3004,4 +3004,56 @@
+ public void setSessionMaxRows(int max) throws SQLException {
+ getCurrentConnection().setSessionMaxRows(max);
}
+
+ public Clob createClob() throws SQLException {
@@ -344,7 +344,7 @@
}
--- a/src/com/mysql/jdbc/ResultSetImpl.java
+++ b/src/com/mysql/jdbc/ResultSetImpl.java
-@@ -8752,4 +8752,200 @@
+@@ -8751,4 +8751,200 @@
protected ExceptionInterceptor getExceptionInterceptor() {
return this.exceptionInterceptor;
}
@@ -547,7 +547,7 @@
}
--- a/src/com/mysql/jdbc/ResultSetMetaData.java
+++ b/src/com/mysql/jdbc/ResultSetMetaData.java
-@@ -848,11 +848,11 @@
+@@ -850,11 +850,11 @@
* @throws java.sql.SQLException If no object found that implements the interface
* @since 1.6
*/
@@ -563,7 +563,7 @@
SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor);
--- a/src/com/mysql/jdbc/StatementImpl.java
+++ b/src/com/mysql/jdbc/StatementImpl.java
-@@ -3008,11 +3008,11 @@
+@@ -2898,11 +2898,11 @@
* @throws java.sql.SQLException If no object found that implements the interface
* @since 1.6
*/
@@ -579,7 +579,7 @@
SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor());
--- a/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
-@@ -2636,4 +2636,139 @@
+@@ -2634,4 +2634,139 @@
// throw SQLError.notImplemented();
// }
@@ -721,9 +721,9 @@
}
--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
-@@ -2870,4 +2870,58 @@
- public boolean getDetectCustomCollations() {
- return this.mc.getDetectCustomCollations();
+@@ -2876,4 +2876,58 @@
+ public void setSessionMaxRows(int max) throws SQLException {
+ this.mc.setSessionMaxRows(max);
}
-}
\ No newline at end of file
@@ -784,7 +784,7 @@
+}
--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
-@@ -450,4 +450,16 @@
+@@ -448,4 +448,16 @@
// public <T> T unwrap(Class<T> iface) throws SQLException {
// throw SQLError.notImplemented();
// }
@@ -803,7 +803,7 @@
}
--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
-@@ -254,4 +254,12 @@
+@@ -253,4 +253,12 @@
protected ExceptionInterceptor getExceptionInterceptor() {
return this.exceptionInterceptor;
}
@@ -819,7 +819,7 @@
\ No newline at end of file
--- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
-@@ -1240,4 +1240,76 @@
+@@ -1238,4 +1238,76 @@
// public Object unwrap(Class arg0) throws SQLException {
// throw SQLError.notImplemented();
// }
@@ -898,7 +898,7 @@
}
--- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
-@@ -866,4 +866,32 @@
+@@ -864,4 +864,32 @@
checkAndFireConnectionError(sqlEx);
}
}
@@ -933,7 +933,7 @@
}
--- a/src/testsuite/regression/StatementRegressionTest.java
+++ b/src/testsuite/regression/StatementRegressionTest.java
-@@ -2537,7 +2537,7 @@
+@@ -2540,7 +2540,7 @@
try {
pStmt = this.conn
.prepareStatement("INSERT INTO testNullClob VALUES (?)");
@@ -942,7 +942,7 @@
pStmt.executeUpdate();
} finally {
if (pStmt != null) {
-@@ -5275,7 +5275,180 @@
+@@ -5278,7 +5278,180 @@
public int getBytesSize() throws SQLException {
return 0;
}
@@ -1124,3 +1124,54 @@
}
/**
+--- a/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
++++ b/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java
+@@ -101,7 +101,7 @@
+ return super.parseURL(url.replaceAll("fabric:", ""), defaults);
+ }
+
+- public Logger getParentLogger() throws SQLException {
+- throw new SQLException("no logging");
++ public Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
+ }
+ }
+--- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
++++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java
+@@ -2789,4 +2789,36 @@
+ public String nativeSQL(String sql) {
+ return null;
+ }
++
++ public java.sql.Clob createClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Blob createBlob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.NClob createNClob() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.SQLXML createSQLXML() throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public java.sql.Struct createStruct(String typeName, Object[] attributes) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
+ }
More information about the pkg-java-commits
mailing list