This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mysql-connector-java.
commit 7acbe240ccdcf2bbe37f3ea861ce5bdb15d917fd Author: Emmanuel Bourg <[email protected]> Date: Tue Jun 10 13:15:31 2014 +0200 Refreshed the patches --- debian/changelog | 4 ++- debian/patches/0002-java6-compilation-compat.patch | 30 +++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15b4d8f..17e2155 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -mysql-connector-java (5.1.30-2) UNRELEASED; urgency=medium +mysql-connector-java (5.1.31-1) UNRELEASED; urgency=medium + * New upstream release + * Refreshed the patches * Moved the package to Git -- Emmanuel Bourg <[email protected]> Tue, 10 Jun 2014 12:44:23 +0200 diff --git a/debian/patches/0002-java6-compilation-compat.patch b/debian/patches/0002-java6-compilation-compat.patch index f2b7b01..9afd5f3 100644 --- a/debian/patches/0002-java6-compilation-compat.patch +++ b/debian/patches/0002-java6-compilation-compat.patch @@ -96,9 +96,9 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/ConnectionImpl.java +++ b/src/com/mysql/jdbc/ConnectionImpl.java -@@ -6112,4 +6112,56 @@ - return getSocketTimeout(); - } +@@ -6131,4 +6131,56 @@ + public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { + this.eventSink = h; } + + public java.sql.Clob createClob() throws SQLException { @@ -178,7 +178,7 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java +++ b/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java -@@ -2662,6 +2662,58 @@ +@@ -2669,6 +2669,58 @@ } @@ -285,9 +285,9 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/ReplicationConnection.java +++ b/src/com/mysql/jdbc/ReplicationConnection.java -@@ -3004,4 +3004,56 @@ - public void setSessionMaxRows(int max) throws SQLException { - getCurrentConnection().setSessionMaxRows(max); +@@ -3020,4 +3020,56 @@ + public void setAllowPublicKeyRetrieval(boolean allowPublicKeyRetrieval) throws SQLException { + getCurrentConnection().setAllowPublicKeyRetrieval(allowPublicKeyRetrieval); } + + public Clob createClob() throws SQLException { @@ -721,9 +721,9 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java +++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java -@@ -2876,4 +2876,58 @@ - public void setSessionMaxRows(int max) throws SQLException { - this.mc.setSessionMaxRows(max); +@@ -2892,4 +2892,58 @@ + public void setAllowPublicKeyRetrieval(boolean allowPublicKeyRetrieval) throws SQLException { + this.mc.setAllowPublicKeyRetrieval(allowPublicKeyRetrieval); } -} \ No newline at end of file @@ -933,7 +933,7 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/testsuite/regression/StatementRegressionTest.java +++ b/src/testsuite/regression/StatementRegressionTest.java -@@ -2540,7 +2540,7 @@ +@@ -2531,7 +2531,7 @@ try { pStmt = this.conn .prepareStatement("INSERT INTO testNullClob VALUES (?)"); @@ -942,7 +942,7 @@ Author: Emmanuel Bourg <[email protected]> pStmt.executeUpdate(); } finally { if (pStmt != null) { -@@ -5278,7 +5278,180 @@ +@@ -5279,7 +5279,180 @@ public int getBytesSize() throws SQLException { return 0; } @@ -1138,9 +1138,9 @@ Author: Emmanuel Bourg <[email protected]> } --- 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; +@@ -2801,4 +2801,36 @@ + public void decachePreparedStatement(ServerPreparedStatement pstmt) + throws SQLException { } + + public java.sql.Clob createClob() throws SQLException { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mysql-connector-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
