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 a8ec4935325b19ed401cc605074994e8564d6eaa Author: Emmanuel Bourg <[email protected]> Date: Fri Aug 22 00:27:46 2014 +0200 Refreshed the patches --- debian/changelog | 7 +++++ debian/patches/0001-disable-testsuite.patch | 8 +++--- debian/patches/0002-java6-compilation-compat.patch | 30 +++++++++++----------- debian/patches/0003-disable-hibernate-fabric.patch | 2 +- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8ddb5c7..4f410e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mysql-connector-java (5.1.32-1) UNRELEASED; urgency=medium + + * New upstream release + * Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Fri, 22 Aug 2014 00:03:51 +0200 + mysql-connector-java (5.1.31-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/0001-disable-testsuite.patch b/debian/patches/0001-disable-testsuite.patch index ea25e63..3f1776f 100644 --- a/debian/patches/0001-disable-testsuite.patch +++ b/debian/patches/0001-disable-testsuite.patch @@ -8,12 +8,12 @@ Subject: [PATCH] disable testsuite --- a/build.xml +++ b/build.xml -@@ -823,7 +823,7 @@ +@@ -832,7 +832,7 @@ </target> -- <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration"> -+ <target name="compile" depends="init, compile-driver, compile.integration"> - </target> +- <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration" /> ++ <target name="compile" depends="init, compile-driver, compile.integration" /> <!-- Compiles the driver itself --> + diff --git a/debian/patches/0002-java6-compilation-compat.patch b/debian/patches/0002-java6-compilation-compat.patch index 9afd5f3..59e2bb1 100644 --- a/debian/patches/0002-java6-compilation-compat.patch +++ b/debian/patches/0002-java6-compilation-compat.patch @@ -96,7 +96,7 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/ConnectionImpl.java +++ b/src/com/mysql/jdbc/ConnectionImpl.java -@@ -6131,4 +6131,56 @@ +@@ -6122,4 +6122,56 @@ public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { this.eventSink = h; } @@ -155,7 +155,7 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/DatabaseMetaData.java +++ b/src/com/mysql/jdbc/DatabaseMetaData.java -@@ -8839,4 +8839,20 @@ +@@ -8829,4 +8829,20 @@ throws SQLException { return true; } @@ -178,7 +178,7 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java +++ b/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java -@@ -2669,6 +2669,58 @@ +@@ -2683,6 +2683,58 @@ } @@ -255,7 +255,7 @@ Author: Emmanuel Bourg <[email protected]> SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); --- a/src/com/mysql/jdbc/NonRegisteringDriver.java +++ b/src/com/mysql/jdbc/NonRegisteringDriver.java -@@ -1001,4 +1001,8 @@ +@@ -1002,4 +1002,8 @@ } } } @@ -266,9 +266,9 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/PreparedStatement.java +++ b/src/com/mysql/jdbc/PreparedStatement.java -@@ -5632,4 +5632,16 @@ - statementStartPos, sql, "SELECT", "\"'`", - "\"'`", false) == -1 && rewritableOdku; +@@ -5623,4 +5623,16 @@ + && StringUtils.indexOfIgnoreCase(statementStartPos, sql, "SELECT", "\"'`", "\"'`", + StringUtils.SEARCH_MODE__MRK_COM_WS) == -1 && rewritableOdku; } + + public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException { @@ -285,9 +285,9 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/jdbc/ReplicationConnection.java +++ b/src/com/mysql/jdbc/ReplicationConnection.java -@@ -3020,4 +3020,56 @@ - public void setAllowPublicKeyRetrieval(boolean allowPublicKeyRetrieval) throws SQLException { - getCurrentConnection().setAllowPublicKeyRetrieval(allowPublicKeyRetrieval); +@@ -3035,4 +3035,56 @@ + public boolean getDontCheckOnDuplicateKeyUpdateInSQL() { + return getCurrentConnection().getDontCheckOnDuplicateKeyUpdateInSQL(); } + + public Clob createClob() throws SQLException { @@ -563,7 +563,7 @@ Author: Emmanuel Bourg <[email protected]> SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor); --- a/src/com/mysql/jdbc/StatementImpl.java +++ b/src/com/mysql/jdbc/StatementImpl.java -@@ -2898,11 +2898,11 @@ +@@ -2902,11 +2902,11 @@ * @throws java.sql.SQLException If no object found that implements the interface * @since 1.6 */ @@ -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 -@@ -2892,4 +2892,58 @@ - public void setAllowPublicKeyRetrieval(boolean allowPublicKeyRetrieval) throws SQLException { - this.mc.setAllowPublicKeyRetrieval(allowPublicKeyRetrieval); +@@ -2907,4 +2907,58 @@ + public boolean getDontCheckOnDuplicateKeyUpdateInSQL() { + return this.mc.getDontCheckOnDuplicateKeyUpdateInSQL(); } -} \ No newline at end of file @@ -1138,7 +1138,7 @@ Author: Emmanuel Bourg <[email protected]> } --- a/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java +++ b/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java -@@ -2801,4 +2801,36 @@ +@@ -2815,4 +2815,36 @@ public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException { } diff --git a/debian/patches/0003-disable-hibernate-fabric.patch b/debian/patches/0003-disable-hibernate-fabric.patch index 6c1d67c..96e49bf 100644 --- a/debian/patches/0003-disable-hibernate-fabric.patch +++ b/debian/patches/0003-disable-hibernate-fabric.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -858,8 +858,10 @@ +@@ -866,8 +866,10 @@ compiler="modern" sourcepath="" srcdir="${buildDir}/${fullProdName}" bootclasspath="${com.mysql.jdbc.java6.rtjar}"> -- 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
