[pkg-java] r17628 - in trunk/mysql-connector-java/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-12-31 21:08:25 +0000 (Tue, 31 Dec 2013)
New Revision: 17628

Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch
Log:
New upstream release (5.1.28)



Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2013-12-31 04:46:53 UTC (rev 17627)
+++ trunk/mysql-connector-java/debian/changelog	2013-12-31 21:08:25 UTC (rev 17628)
@@ -1,3 +1,10 @@
+mysql-connector-java (5.1.28-1) unstable; urgency=medium
+
+  * New upstream release
+  * Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 31 Dec 2013 22:02:44 +0100
+
 mysql-connector-java (5.1.27-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch	2013-12-31 04:46:53 UTC (rev 17627)
+++ trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch	2013-12-31 21:08:25 UTC (rev 17628)
@@ -96,7 +96,7 @@
  }
 --- a/src/com/mysql/jdbc/ConnectionImpl.java
 +++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -6114,4 +6114,56 @@
+@@ -6123,4 +6123,56 @@
  			return getSocketTimeout();
  		}
  	}
@@ -328,7 +328,7 @@
  }
 --- a/src/com/mysql/jdbc/PreparedStatement.java
 +++ b/src/com/mysql/jdbc/PreparedStatement.java
-@@ -5758,4 +5758,16 @@
+@@ -5740,4 +5740,16 @@
  						statementStartPos, sql, "SELECT", "\"'`",
  						"\"'`", false) == -1 && rewritableOdku;
  	}
@@ -347,7 +347,7 @@
  }
 --- a/src/com/mysql/jdbc/ReplicationConnection.java
 +++ b/src/com/mysql/jdbc/ReplicationConnection.java
-@@ -2944,4 +2944,56 @@
+@@ -2970,4 +2970,56 @@
  	public String getConnectionAttributes() throws SQLException {
  		return getCurrentConnection().getConnectionAttributes();
  	}
@@ -406,7 +406,7 @@
  }
 --- a/src/com/mysql/jdbc/ResultSetImpl.java
 +++ b/src/com/mysql/jdbc/ResultSetImpl.java
-@@ -8743,4 +8743,204 @@
+@@ -8752,4 +8752,200 @@
  	protected ExceptionInterceptor getExceptionInterceptor() {
  		return this.exceptionInterceptor;
  	}
@@ -431,10 +431,6 @@
 +        throw new UnsupportedOperationException();
 +    }
 +
-+    public boolean isClosed() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
 +    public void updateNString(int columnIndex, String nString) throws SQLException {
 +        throw new UnsupportedOperationException();
 +    }
@@ -613,7 +609,7 @@
  }
 --- a/src/com/mysql/jdbc/ResultSetMetaData.java
 +++ b/src/com/mysql/jdbc/ResultSetMetaData.java
-@@ -849,11 +849,11 @@
+@@ -848,11 +848,11 @@
       * @throws java.sql.SQLException If no object found that implements the interface 
       * @since 1.6
       */
@@ -629,7 +625,7 @@
              		SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor);
 --- a/src/com/mysql/jdbc/StatementImpl.java
 +++ b/src/com/mysql/jdbc/StatementImpl.java
-@@ -2971,11 +2971,11 @@
+@@ -3008,11 +3008,11 @@
       * @throws java.sql.SQLException If no object found that implements the interface
       * @since 1.6
       */
@@ -1003,7 +999,7 @@
  }
 --- a/src/testsuite/regression/StatementRegressionTest.java
 +++ b/src/testsuite/regression/StatementRegressionTest.java
-@@ -2542,7 +2542,7 @@
+@@ -2537,7 +2537,7 @@
  		try {
  			pStmt = this.conn
  					.prepareStatement("INSERT INTO testNullClob VALUES (?)");
@@ -1012,7 +1008,7 @@
  			pStmt.executeUpdate();
  		} finally {
  			if (pStmt != null) {
-@@ -5272,7 +5272,180 @@
+@@ -5275,7 +5275,180 @@
  			public int getBytesSize() throws SQLException {
  				return 0;
  			}