[pkg-java] r17748 - in trunk/mysql-connector-java/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Feb 10 10:29:18 UTC 2014
Author: ebourg-guest
Date: 2014-02-10 10:29:18 +0000 (Mon, 10 Feb 2014)
New Revision: 17748
Modified:
trunk/mysql-connector-java/debian/changelog
trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch
Log:
New upstream release (5.1.29)
Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog 2014-02-09 19:01:49 UTC (rev 17747)
+++ trunk/mysql-connector-java/debian/changelog 2014-02-10 10:29:18 UTC (rev 17748)
@@ -1,3 +1,10 @@
+mysql-connector-java (5.1.29-1) unstable; urgency=medium
+
+ * New upstream release
+ * Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 08 Feb 2014 17:15:13 +0100
+
mysql-connector-java (5.1.28-1) unstable; urgency=medium
* New upstream release
Modified: trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch 2014-02-09 19:01:49 UTC (rev 17747)
+++ trunk/mysql-connector-java/debian/patches/0001-disable-testsuite.patch 2014-02-10 10:29:18 UTC (rev 17748)
@@ -8,7 +8,7 @@
--- a/build.xml
+++ b/build.xml
-@@ -796,7 +796,7 @@
+@@ -800,7 +800,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-02-09 19:01:49 UTC (rev 17747)
+++ trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch 2014-02-10 10:29:18 UTC (rev 17748)
@@ -96,7 +96,7 @@
}
--- a/src/com/mysql/jdbc/ConnectionImpl.java
+++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -6123,4 +6123,56 @@
+@@ -6140,4 +6140,56 @@
return getSocketTimeout();
}
}
@@ -155,7 +155,7 @@
}
--- a/src/com/mysql/jdbc/DatabaseMetaData.java
+++ b/src/com/mysql/jdbc/DatabaseMetaData.java
-@@ -8854,4 +8854,20 @@
+@@ -8832,4 +8832,20 @@
throws SQLException {
return true;
}
@@ -178,127 +178,65 @@
}
--- a/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java
+++ b/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java
-@@ -2553,34 +2553,34 @@
- getActiveMySQLConnection().setIncludeThreadNamesAsStatementComment(flag);
- }
-
-- public boolean isServerLocal() throws SQLException {
-- return getActiveMySQLConnection().isServerLocal();
-- }
--
-- public void setAuthenticationPlugins(String authenticationPlugins) {
-- getActiveMySQLConnection().setAuthenticationPlugins(authenticationPlugins);
-- }
--
-- public String getAuthenticationPlugins() {
-- return getActiveMySQLConnection().getAuthenticationPlugins();
-- }
--
-- public void setDisabledAuthenticationPlugins(
-- String disabledAuthenticationPlugins) {
-- getActiveMySQLConnection().setDisabledAuthenticationPlugins(disabledAuthenticationPlugins);
-- }
--
-- public String getDisabledAuthenticationPlugins() {
-- return getActiveMySQLConnection().getDisabledAuthenticationPlugins();
-- }
--
-- public void setDefaultAuthenticationPlugin(
-- String defaultAuthenticationPlugin) {
-- getActiveMySQLConnection().setDefaultAuthenticationPlugin(defaultAuthenticationPlugin);
-- }
--
-- public String getDefaultAuthenticationPlugin() {
-- return getActiveMySQLConnection().getDefaultAuthenticationPlugin();
-+ public boolean isServerLocal() throws SQLException {
-+ return getActiveMySQLConnection().isServerLocal();
-+ }
-+
-+ public void setAuthenticationPlugins(String authenticationPlugins) {
-+ getActiveMySQLConnection().setAuthenticationPlugins(authenticationPlugins);
-+ }
-+
-+ public String getAuthenticationPlugins() {
-+ return getActiveMySQLConnection().getAuthenticationPlugins();
-+ }
-+
-+ public void setDisabledAuthenticationPlugins(
-+ String disabledAuthenticationPlugins) {
-+ getActiveMySQLConnection().setDisabledAuthenticationPlugins(disabledAuthenticationPlugins);
-+ }
-+
-+ public String getDisabledAuthenticationPlugins() {
-+ return getActiveMySQLConnection().getDisabledAuthenticationPlugins();
-+ }
-+
-+ public void setDefaultAuthenticationPlugin(
-+ String defaultAuthenticationPlugin) {
-+ getActiveMySQLConnection().setDefaultAuthenticationPlugin(defaultAuthenticationPlugin);
-+ }
-+
-+ public String getDefaultAuthenticationPlugin() {
-+ return getActiveMySQLConnection().getDefaultAuthenticationPlugin();
- }
-
- public void setParseInfoCacheFactory(String factoryClassname) {
-@@ -2673,4 +2673,57 @@
- // nothing to do here.
-
- }
-+
-+
-+ 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 boolean isValid(int timeout) 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 String getClientInfo(String name) throws SQLException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public Properties getClientInfo() throws SQLException {
-+ 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();
-+ }
-+
-+ public <T> T unwrap(Class<T> iface) throws SQLException {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
-+ throw new UnsupportedOperationException();
-+ }
- }
+@@ -2674,6 +2674,58 @@
+
+ }
+
++ 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 boolean isValid(int timeout) 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 String getClientInfo(String name) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public Properties getClientInfo() throws SQLException {
++ 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();
++ }
++
++ public <T> T unwrap(Class<T> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
++ public boolean isWrapperFor(Class<?> iface) throws SQLException {
++ throw new UnsupportedOperationException();
++ }
++
+ public void setDetectCustomCollations(boolean detectCustomCollations) {
+ getActiveMySQLConnection().setDetectCustomCollations(detectCustomCollations);
+ }
--- a/src/com/mysql/jdbc/MysqlParameterMetadata.java
+++ b/src/com/mysql/jdbc/MysqlParameterMetadata.java
@@ -202,11 +202,11 @@
@@ -347,9 +285,9 @@
}
--- a/src/com/mysql/jdbc/ReplicationConnection.java
+++ b/src/com/mysql/jdbc/ReplicationConnection.java
-@@ -2970,4 +2970,56 @@
- public String getConnectionAttributes() throws SQLException {
- return getCurrentConnection().getConnectionAttributes();
+@@ -2978,4 +2978,56 @@
+ public boolean getDetectCustomCollations() {
+ return getCurrentConnection().getDetectCustomCollations();
}
+
+ public Clob createClob() throws SQLException {
@@ -783,19 +721,14 @@
}
--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
-@@ -2859,7 +2859,59 @@
-
+@@ -2870,4 +2870,58 @@
+ public boolean getDetectCustomCollations() {
+ return this.mc.getDetectCustomCollations();
}
-
-- public String getConnectionAttributes() throws SQLException {
-- return this.mc.getConnectionAttributes();
-- }
-}
\ No newline at end of file
-+ public String getConnectionAttributes() throws SQLException {
-+ return this.mc.getConnectionAttributes();
-+ }
+
++
+ public java.sql.Clob createClob() throws SQLException {
+ throw new UnsupportedOperationException();
+ }
@@ -847,6 +780,7 @@
+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
+ throw new UnsupportedOperationException();
+ }
++
+}
--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
More information about the pkg-java-commits
mailing list