[pkg-java] r17135 - in tags/mysql-connector-java: . 5.1.26-1/debian 5.1.26-1/debian/patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Fri Aug 9 13:19:57 UTC 2013


Author: ebourg-guest
Date: 2013-08-09 13:19:57 +0000 (Fri, 09 Aug 2013)
New Revision: 17135

Added:
   tags/mysql-connector-java/5.1.26-1/
   tags/mysql-connector-java/5.1.26-1/debian/changelog
   tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch
   tags/mysql-connector-java/5.1.26-1/debian/rules
Removed:
   tags/mysql-connector-java/5.1.26-1/debian/changelog
   tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch
   tags/mysql-connector-java/5.1.26-1/debian/rules
Log:
[svn-buildpackage] Tagging mysql-connector-java 5.1.26-1

Deleted: tags/mysql-connector-java/5.1.26-1/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2013-08-08 11:25:04 UTC (rev 17133)
+++ tags/mysql-connector-java/5.1.26-1/debian/changelog	2013-08-09 13:19:57 UTC (rev 17135)
@@ -1,201 +0,0 @@
-mysql-connector-java (5.1.25-1) unstable; urgency=low
-
-  * New upstream release
-  * Refreshed the patches
-  * Added a patch to build with one JDK and removed the build
-    dependency on java-gcj-compat-dev
-  * Updated Standards-Version to 3.9.4 (no changes)
-  * Use canonical URLs for the Vcs-* fields
-  * debian/rules: Improved the clean target to allow rebuilds
-  * Updated the watch file
-  * Renamed debian/README.Debian-source to README.source
-
-  [ Miguel Landaeta ] 
-  * Fix FTBFS with OpenJDK 7 (Closes: #706668)
-  * Remove Michael Koch from Uploaders list.
-    Thanks for your work on this package. (Closes: #654122).
-
- -- Emmanuel Bourg <ebourg at apache.org>  Tue, 02 Jul 2013 17:07:51 +0200
-
-mysql-connector-java (5.1.16-2) unstable; urgency=low
-
-  * Team upload.
-  * Switch to default-jdk (Closes: #640619)
-
- -- Torsten Werner <twerner at debian.org>  Tue, 06 Sep 2011 21:28:09 +0200
-
-mysql-connector-java (5.1.16-1) unstable; urgency=low
-
-  * Team upload.
-
-  [ Miguel Telleria de Esteban ]
-  * Add mh_installpoms to give maven support for other packages using
-    mysql-java. (Closes: #627746)
-
-  [ Torsten Werner ]
-  * New upstream release. Switch from commons logging to slf4j.
-  * Clean up orig tarball even more. Remove c3p0*.zip and documentation without
-    source format.
-  * Add target get-orig-source to debian/rules.
-  * Remove Arnaud from Uploaders list.
-  * Remove Java runtime from Depends.
-  * Switch to source format 3.0.
-  * Switch to debhelper level 7.
-  * Update Standards-Version: 3.9.1.
-
- -- Torsten Werner <twerner at debian.org>  Thu, 25 Aug 2011 11:09:59 +0200
-
-mysql-connector-java (5.1.10+dfsg-2) unstable; urgency=low
-
-  * Fix installation of versioned jar (Closes: #549677).
-
- -- Michael Koch <konqueror at gmx.de>  Mon, 05 Oct 2009 20:18:40 +0200
-
-mysql-connector-java (5.1.10+dfsg-1) unstable; urgency=low
-
-  * New upstream release.
-  * Build-Depends on cdbs.
-  * Made java-gcj-compat-dev a Build-Depends instead of
-    a Build-Depends-Indep.
-  * Build-Depends-Indep on openjdk-6-jdk for JDBC 4.
-  * Build-Depends on debhelper >= 7.
-  * Moved package to section 'java'.
-  * Let package Depends on default-jre-headless and alternatives.
-  * Add Depends ${misc:Depends} to libmysql-java.
-  * Fixed watch file to use a decent FTP mirror.
-  * Added automatic orig tarball creation on upstream updates.
-  * Updated Standards-Version to 3.8.3.
-  * In debian/rules always use JAVA_HOME when possible.
-
- -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 11:22:43 +0200
-
-mysql-connector-java (5.1.6+dfsg-1) unstable; urgency=low
-
-  * New upstream release. Thanks to Eric Jensen for the hint.
-  * Added watch file.
-  * Updated Standards-Version to 3.7.3.
-  * Fixed Homepage, Vcs-Svn and Vcs-Browser fields.
-
- -- Michael Koch <konqueror at gmx.de>  Wed, 02 Apr 2008 10:36:05 +0200
-
-mysql-connector-java (5.1.5+dfsg-2) unstable; urgency=low
-
-  * Disable JDBC4 support. Closes: #454081.
-
- -- Michael Koch <konqueror at gmx.de>  Tue, 04 Dec 2007 01:03:48 +0100
-
-mysql-connector-java (5.1.5+dfsg-1) unstable; urgency=low
-
-  * New upstream release. Closes: #450718.
-  * Add Homepage field to debian/control.
-
- -- Michael Koch <konqueror at gmx.de>  Fri, 30 Nov 2007 10:34:13 +0100
-
-mysql-connector-java (5.0.4+dfsg-3) unstable; urgency=low
-
-  * Delete build-stamp in clean target. Closes: #424589.
-  * Removed Wolfgang and added myself to Uploaders.
-
- -- Michael Koch <konqueror at gmx.de>  Sun, 15 Jul 2007 23:12:02 +0200
-
-mysql-connector-java (5.0.4+dfsg-2) unstable; urgency=low
-
-  * Corrected the symlink `/usr/share/java/mysql.jar'. Thanks to Javier
-    Kohen. (Closes: #404858)
-
- -- Marcus Better <marcus at better.se>  Fri, 29 Dec 2006 13:29:04 +0100
-
-mysql-connector-java (5.0.4+dfsg-1) unstable; urgency=low
-
-  * New upstream release. (Closes: #404153, #366808, #394878)
-    - Supports MySQL 5. (Closes: #369379)
-    - Fixes a character set mapping problem. (Closes: #387382)
-  * debian/rules: Get rid of cdbs. Install `CHANGES' file in proper place.
-  * The jar file is now named `mysql-connector-java.jar' instead of
-    `mysql.jar'. Symlinks are provided for the old names for the time
-    being.
-  * debian/control:
-    - Replace Build-Depends-Indep by Build-Depends.
-    - Add missing dependency on ant-optional.
-    - Add XS-Vcs-* fields.
-  * debian/rules: Build with java-gcj-compat-dev instead of Kaffe.
-  * Removed README.Debian since the information on supported JDK versions
-    may be outdated.
-
- -- Marcus Better <marcus at better.se>  Fri, 22 Dec 2006 10:45:42 +0100
-
-mysql-connector-java (3.1.11-1) unstable; urgency=low
-
-  * New upstream release (closes: #338399)
-  * Removed Takashi from uploaders
-  * Removed setting of DEB_ANT_COMPILER variable as already preset in kaffe
-  * Updated build.xml patch once more to changed upstream build behaviour
-
- -- Wolfgang Baer <WBaer at gmx.de>  Tue, 29 Nov 2005 14:07:49 +0100
-
-mysql-connector-java (3.1.10-1) unstable; urgency=low
-
-  * New upstream release
-    + Source structure changed - adapting package build to new structure
-    + Updated README.Debian-source how its repackaged
-  * libant1.6-java to ant transition
-  * Standards-Version 3.6.2 (no changes)
-  * Removed documentation as its explicitly marked as NOT GNU licensed.
-
-  * Upload sponsored by Arnaud Vandyck
-
- -- Wolfgang Baer <WBaer at gmx.de>  Sun, 11 Sep 2005 15:35:23 +0200
-
-mysql-connector-java (3.1.7-2) unstable; urgency=low
-
-  * Move to main
-
- -- Wolfgang Baer <WBaer at gmx.de>  Tue, 19 Apr 2005 20:28:25 +0200
-
-mysql-connector-java (3.1.7-1) unstable; urgency=low
-
-  * New upstream release (closes: #282570,#293995)
-  * Now implements JDBC 3 specification - Updated README.Debian/Descriptions
-  * Built with free tools - but stay in contrib to get it into
-    sarge asap (old release does not support mysql 4.1 features)
-    Upload to main will follow afterwards
-  * Changed build system to cdbs: build depends now on kaffe, libant1.6-java, 
-    liblog4j1.2-java, junit; Added liblog4j1.2-java as Suggests
-  * No more build depends on jars under /usr/local (closes: #262291)
-  * Patched build.xml (01_BuildXml.patch):
-    - Changed build directory property to a directory inside source tree
-    - Excluded test from testsuite which build depends on 
-      sun internal stuff (AppletRegressionTest.java)
-    - Patched javac target to use target=1.3 so it is also usable with 
-      JDK 1.3, -Xverify:none needs to be passed to the vm (see README.Debian)
-  * Standards-Version: 3.6.1 - no changes required
-  * Changed maintainer to Debian Java Maintainers as
-    requested by Takashi Okamoto for comaintaining
-  * avdyk: added Wolfgang and myself to the uploaders
-
- -- Wolfgang Baer <WBaer at gmx.de>  Sat, 02 Apr 2005 20:30:09 +0200
-
-mysql-connector-java (3.0.9-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Takashi Okamoto <tora at debian.org>  Tue, 30 Dec 2003 22:37:53 +0900
-
-mysql-connector-java (3.0.8-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Takashi Okamoto <tora at debian.org>  Mon, 26 May 2003 10:42:20 +0900
-
-mysql-connector-java (3.0.6-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Takashi Okamoto <tora at debian.org>  Sun, 23 Feb 2003 21:38:54 +0900
-
-mysql-connector-java (2.0.14-1) unstable; urgency=low
-
-  * Initial Release.
-  * close RFP (closes: #104765)
-
- -- Takashi Okamoto <tora at debian.org>  Sun, 10 Nov 2002 10:29:30 +0900

Copied: tags/mysql-connector-java/5.1.26-1/debian/changelog (from rev 17134, trunk/mysql-connector-java/debian/changelog)
===================================================================
--- tags/mysql-connector-java/5.1.26-1/debian/changelog	                        (rev 0)
+++ tags/mysql-connector-java/5.1.26-1/debian/changelog	2013-08-09 13:19:57 UTC (rev 17135)
@@ -0,0 +1,209 @@
+mysql-connector-java (5.1.26-1) unstable; urgency=low
+
+  * New upstream release
+  * Refreshed the patches
+  * Generate Java 6 compatible bytecode
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 09 Aug 2013 14:47:12 +0200
+
+mysql-connector-java (5.1.25-1) unstable; urgency=low
+
+  * New upstream release
+  * Refreshed the patches
+  * Added a patch to build with one JDK and removed the build
+    dependency on java-gcj-compat-dev
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * Use canonical URLs for the Vcs-* fields
+  * debian/rules: Improved the clean target to allow rebuilds
+  * Updated the watch file
+  * Renamed debian/README.Debian-source to README.source
+
+  [ Miguel Landaeta ] 
+  * Fix FTBFS with OpenJDK 7 (Closes: #706668)
+  * Remove Michael Koch from Uploaders list.
+    Thanks for your work on this package. (Closes: #654122).
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 02 Jul 2013 17:07:51 +0200
+
+mysql-connector-java (5.1.16-2) unstable; urgency=low
+
+  * Team upload.
+  * Switch to default-jdk (Closes: #640619)
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 06 Sep 2011 21:28:09 +0200
+
+mysql-connector-java (5.1.16-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Miguel Telleria de Esteban ]
+  * Add mh_installpoms to give maven support for other packages using
+    mysql-java. (Closes: #627746)
+
+  [ Torsten Werner ]
+  * New upstream release. Switch from commons logging to slf4j.
+  * Clean up orig tarball even more. Remove c3p0*.zip and documentation without
+    source format.
+  * Add target get-orig-source to debian/rules.
+  * Remove Arnaud from Uploaders list.
+  * Remove Java runtime from Depends.
+  * Switch to source format 3.0.
+  * Switch to debhelper level 7.
+  * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 25 Aug 2011 11:09:59 +0200
+
+mysql-connector-java (5.1.10+dfsg-2) unstable; urgency=low
+
+  * Fix installation of versioned jar (Closes: #549677).
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 05 Oct 2009 20:18:40 +0200
+
+mysql-connector-java (5.1.10+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Depends on cdbs.
+  * Made java-gcj-compat-dev a Build-Depends instead of
+    a Build-Depends-Indep.
+  * Build-Depends-Indep on openjdk-6-jdk for JDBC 4.
+  * Build-Depends on debhelper >= 7.
+  * Moved package to section 'java'.
+  * Let package Depends on default-jre-headless and alternatives.
+  * Add Depends ${misc:Depends} to libmysql-java.
+  * Fixed watch file to use a decent FTP mirror.
+  * Added automatic orig tarball creation on upstream updates.
+  * Updated Standards-Version to 3.8.3.
+  * In debian/rules always use JAVA_HOME when possible.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 11:22:43 +0200
+
+mysql-connector-java (5.1.6+dfsg-1) unstable; urgency=low
+
+  * New upstream release. Thanks to Eric Jensen for the hint.
+  * Added watch file.
+  * Updated Standards-Version to 3.7.3.
+  * Fixed Homepage, Vcs-Svn and Vcs-Browser fields.
+
+ -- Michael Koch <konqueror at gmx.de>  Wed, 02 Apr 2008 10:36:05 +0200
+
+mysql-connector-java (5.1.5+dfsg-2) unstable; urgency=low
+
+  * Disable JDBC4 support. Closes: #454081.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 04 Dec 2007 01:03:48 +0100
+
+mysql-connector-java (5.1.5+dfsg-1) unstable; urgency=low
+
+  * New upstream release. Closes: #450718.
+  * Add Homepage field to debian/control.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 30 Nov 2007 10:34:13 +0100
+
+mysql-connector-java (5.0.4+dfsg-3) unstable; urgency=low
+
+  * Delete build-stamp in clean target. Closes: #424589.
+  * Removed Wolfgang and added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 15 Jul 2007 23:12:02 +0200
+
+mysql-connector-java (5.0.4+dfsg-2) unstable; urgency=low
+
+  * Corrected the symlink `/usr/share/java/mysql.jar'. Thanks to Javier
+    Kohen. (Closes: #404858)
+
+ -- Marcus Better <marcus at better.se>  Fri, 29 Dec 2006 13:29:04 +0100
+
+mysql-connector-java (5.0.4+dfsg-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #404153, #366808, #394878)
+    - Supports MySQL 5. (Closes: #369379)
+    - Fixes a character set mapping problem. (Closes: #387382)
+  * debian/rules: Get rid of cdbs. Install `CHANGES' file in proper place.
+  * The jar file is now named `mysql-connector-java.jar' instead of
+    `mysql.jar'. Symlinks are provided for the old names for the time
+    being.
+  * debian/control:
+    - Replace Build-Depends-Indep by Build-Depends.
+    - Add missing dependency on ant-optional.
+    - Add XS-Vcs-* fields.
+  * debian/rules: Build with java-gcj-compat-dev instead of Kaffe.
+  * Removed README.Debian since the information on supported JDK versions
+    may be outdated.
+
+ -- Marcus Better <marcus at better.se>  Fri, 22 Dec 2006 10:45:42 +0100
+
+mysql-connector-java (3.1.11-1) unstable; urgency=low
+
+  * New upstream release (closes: #338399)
+  * Removed Takashi from uploaders
+  * Removed setting of DEB_ANT_COMPILER variable as already preset in kaffe
+  * Updated build.xml patch once more to changed upstream build behaviour
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 29 Nov 2005 14:07:49 +0100
+
+mysql-connector-java (3.1.10-1) unstable; urgency=low
+
+  * New upstream release
+    + Source structure changed - adapting package build to new structure
+    + Updated README.Debian-source how its repackaged
+  * libant1.6-java to ant transition
+  * Standards-Version 3.6.2 (no changes)
+  * Removed documentation as its explicitly marked as NOT GNU licensed.
+
+  * Upload sponsored by Arnaud Vandyck
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sun, 11 Sep 2005 15:35:23 +0200
+
+mysql-connector-java (3.1.7-2) unstable; urgency=low
+
+  * Move to main
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 19 Apr 2005 20:28:25 +0200
+
+mysql-connector-java (3.1.7-1) unstable; urgency=low
+
+  * New upstream release (closes: #282570,#293995)
+  * Now implements JDBC 3 specification - Updated README.Debian/Descriptions
+  * Built with free tools - but stay in contrib to get it into
+    sarge asap (old release does not support mysql 4.1 features)
+    Upload to main will follow afterwards
+  * Changed build system to cdbs: build depends now on kaffe, libant1.6-java, 
+    liblog4j1.2-java, junit; Added liblog4j1.2-java as Suggests
+  * No more build depends on jars under /usr/local (closes: #262291)
+  * Patched build.xml (01_BuildXml.patch):
+    - Changed build directory property to a directory inside source tree
+    - Excluded test from testsuite which build depends on 
+      sun internal stuff (AppletRegressionTest.java)
+    - Patched javac target to use target=1.3 so it is also usable with 
+      JDK 1.3, -Xverify:none needs to be passed to the vm (see README.Debian)
+  * Standards-Version: 3.6.1 - no changes required
+  * Changed maintainer to Debian Java Maintainers as
+    requested by Takashi Okamoto for comaintaining
+  * avdyk: added Wolfgang and myself to the uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 02 Apr 2005 20:30:09 +0200
+
+mysql-connector-java (3.0.9-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org>  Tue, 30 Dec 2003 22:37:53 +0900
+
+mysql-connector-java (3.0.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org>  Mon, 26 May 2003 10:42:20 +0900
+
+mysql-connector-java (3.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org>  Sun, 23 Feb 2003 21:38:54 +0900
+
+mysql-connector-java (2.0.14-1) unstable; urgency=low
+
+  * Initial Release.
+  * close RFP (closes: #104765)
+
+ -- Takashi Okamoto <tora at debian.org>  Sun, 10 Nov 2002 10:29:30 +0900

Deleted: tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch
===================================================================
--- trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch	2013-08-08 11:25:04 UTC (rev 17133)
+++ tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch	2013-08-09 13:19:57 UTC (rev 17135)
@@ -1,1196 +0,0 @@
-Description: This patch adds dummy JDBC4 methods to enable the compilation
- with Java 6 or 7 and no longer require Java 5
-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 @@
- 	     * @throws java.sql.SQLException If no object found that implements the interface 
- 	     * @since 1.6
- 	     */
--		public Object unwrap(Class<?> iface) throws java.sql.SQLException {
-+        public <T> T unwrap(Class<T> iface) throws SQLException {
- 	    	try {
- 	    		// This works for classes that aren't actually wrapping
- 	    		// anything
--	    		return Util.cast(iface, this);
-+	    		return iface.cast(this);
- 	        } catch (ClassCastException cce) {
- 	            throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), 
- 	            		SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor());
-@@ -2670,4 +2670,76 @@
- 			}
- 		}
- 	}
-+
-+    public java.sql.RowId getRowId(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.RowId getRowId(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setRowId(String parameterName, java.sql.RowId x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNString(String parameterName, String value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(String parameterName, java.sql.NClob value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.NClob getNClob(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.NClob getNClob(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public String getNString(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public String getNString(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getNCharacterStream(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getNCharacterStream(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getCharacterStream(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getCharacterStream(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(String parameterName, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
- }
---- a/src/com/mysql/jdbc/ConnectionImpl.java
-+++ b/src/com/mysql/jdbc/ConnectionImpl.java
-@@ -6101,4 +6101,56 @@
- 			return getSocketTimeout();
- 		}
- 	}
-+
-+    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();
-+    }
- }
---- a/src/com/mysql/jdbc/DatabaseMetaData.java
-+++ b/src/com/mysql/jdbc/DatabaseMetaData.java
-@@ -8540,4 +8540,28 @@
-             throws SQLException {
- 		return true;
- 	}
-+
-+    public java.sql.RowIdLifetime getRowIdLifetime() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public ResultSet getClientInfoProperties() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) 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 SQLException();
-+    }
- }
---- 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) {
-@@ -2635,4 +2635,57 @@
- 	public String getConnectionAttributes() throws SQLException {
- 		return getActiveMySQLConnection().getConnectionAttributes();
- 	}
-+
-+
-+    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();
-+    }
- }
---- a/src/com/mysql/jdbc/MysqlParameterMetadata.java
-+++ b/src/com/mysql/jdbc/MysqlParameterMetadata.java
-@@ -202,11 +202,11 @@
-      * @throws java.sql.SQLException If no object found that implements the interface 
-      * @since 1.6
-      */
--	public Object unwrap(Class<?> iface) throws java.sql.SQLException {
-+    public <T> T unwrap(Class<T> iface) throws SQLException {
-     	try {
-     		// This works for classes that aren't actually wrapping
-     		// anything
--    		return Util.cast(iface, this);
-+    		return iface.cast(this);
-         } catch (ClassCastException cce) {
-             throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), 
-             		SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor);
---- a/src/com/mysql/jdbc/NonRegisteringDriver.java
-+++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
-@@ -966,4 +966,8 @@
- 			}
- 		}
- 	}
-+
-+    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+        throw new java.sql.SQLFeatureNotSupportedException();
-+    }
- }
---- a/src/com/mysql/jdbc/PreparedStatement.java
-+++ b/src/com/mysql/jdbc/PreparedStatement.java
-@@ -5757,4 +5757,16 @@
- 						statementStartPos, sql, "SELECT", "\"'`",
- 						"\"'`", false) == -1 && rewritableOdku;
- 	}
-+
-+    public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
- }
---- a/src/com/mysql/jdbc/ReplicationConnection.java
-+++ b/src/com/mysql/jdbc/ReplicationConnection.java
-@@ -2695,4 +2695,56 @@
- 	public Object getConnectionMutex() {
- 		return getCurrentConnection().getConnectionMutex();
- 	}
-+
-+    public Clob createClob() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public 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();
-+    }
- }
---- a/src/com/mysql/jdbc/ResultSetImpl.java
-+++ b/src/com/mysql/jdbc/ResultSetImpl.java
-@@ -8747,4 +8747,204 @@
- 	protected ExceptionInterceptor getExceptionInterceptor() {
- 		return this.exceptionInterceptor;
- 	}
-+
-+    public java.sql.RowId getRowId(int columnIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.RowId getRowId(String columnLabel) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public int getHoldability() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public boolean isClosed() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNString(int columnIndex, String nString) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNString(String columnLabel, String nString) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.NClob getNClob(int columnIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.NClob getNClob(String columnLabel) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public String getNString(int columnIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public String getNString(String columnLabel) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.io.Reader getNCharacterStream(String columnLabel) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateClob(int columnIndex, java.io.Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateClob(String columnLabel, java.io.Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNClob(int columnIndex, java.io.Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNClob(String columnLabel, java.io.Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateClob(int columnIndex, java.io.Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateClob(String columnLabel, java.io.Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNClob(int columnIndex, java.io.Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void updateNClob(String columnLabel, java.io.Reader reader) 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();
-+    }
- }
---- a/src/com/mysql/jdbc/ResultSetMetaData.java
-+++ b/src/com/mysql/jdbc/ResultSetMetaData.java
-@@ -849,11 +849,11 @@
-      * @throws java.sql.SQLException If no object found that implements the interface 
-      * @since 1.6
-      */
--	public Object unwrap(Class<?> iface) throws java.sql.SQLException {
-+    public <T> T unwrap(Class<T> iface) throws SQLException {
-     	try {
-     		// This works for classes that aren't actually wrapping
-     		// anything
--    		return Util.cast(iface, this);
-+    		return iface.cast(this);
-         } catch (ClassCastException cce) {
-             throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), 
-             		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 @@
-      * @throws java.sql.SQLException If no object found that implements the interface
-      * @since 1.6
-      */
--	public Object unwrap(Class<?> iface) throws java.sql.SQLException {
-+    public <T> T unwrap(Class<T> iface) throws SQLException {
-     	try {
-     		// This works for classes that aren't actually wrapping
-     		// anything
--            return Util.cast(iface, this);
-+            return iface.cast(this);
-         } catch (ClassCastException cce) {
-             throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(),
-             		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 @@
- //		throw SQLError.notImplemented();
- //	}
- 
-+    public java.sql.RowId getRowId(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.RowId getRowId(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setRowId(String parameterName, java.sql.RowId x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNString(String parameterName, String value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(String parameterName, java.sql.NClob value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setClob(String parameterName, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.NClob getNClob(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.NClob getNClob(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public String getNString(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public String getNString(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getNCharacterStream(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getNCharacterStream(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getCharacterStream(int parameterIndex) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public Reader getCharacterStream(String parameterName) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBlob(String parameterName, Blob x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setClob(String parameterName, Clob x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setClob(String parameterName, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(String parameterName, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
- }
---- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
-+++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
-@@ -2834,4 +2834,55 @@
- 		return this.mc.getConnectionMutex();
- 	}
- 
-+    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();
-+    }
- }
-\ No newline at end of file
---- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
-+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
-@@ -450,4 +450,16 @@
- //	public <T> T unwrap(Class<T> iface) throws SQLException {
- //		throw SQLError.notImplemented();
- //	}
-+    
-+    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
-+        throw new java.sql.SQLFeatureNotSupportedException();
-+    }
-+
-+    public <T> T unwrap(Class<T> iface) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
- }
---- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
-+++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
-@@ -254,4 +254,12 @@
- 	protected ExceptionInterceptor getExceptionInterceptor() {
- 		return this.exceptionInterceptor;
- 	}
-+
-+    public void addStatementEventListener(javax.sql.StatementEventListener listener) {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void removeStatementEventListener(javax.sql.StatementEventListener listener) {
-+        throw new UnsupportedOperationException();
-+    }
- }
-\ No newline at end of file
---- a/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
-+++ b/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java
-@@ -1224,4 +1224,76 @@
- //	public Object unwrap(Class arg0) throws SQLException {
- //		throw SQLError.notImplemented();
- //	}
-+    
-+    public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNString(int parameterIndex, String value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setClob(int parameterIndex, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
- }
---- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
-+++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
-@@ -866,4 +866,32 @@
- 			checkAndFireConnectionError(sqlEx);
- 		}
- 	}
-+
-+    public boolean isClosed() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void setPoolable(boolean poolable) throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public boolean isPoolable() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public void closeOnCompletion() throws SQLException {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    public boolean isCloseOnCompletion() 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();
-+    }
- }
---- a/src/testsuite/regression/StatementRegressionTest.java
-+++ b/src/testsuite/regression/StatementRegressionTest.java
-@@ -2542,7 +2542,7 @@
- 		try {
- 			pStmt = this.conn
- 					.prepareStatement("INSERT INTO testNullClob VALUES (?)");
--			pStmt.setClob(1, null);
-+			pStmt.setClob(1, (Clob) null);
- 			pStmt.executeUpdate();
- 		} finally {
- 			if (pStmt != null) {
-@@ -5272,7 +5272,180 @@
- 			public int getBytesSize() throws SQLException {
- 				return 0;
- 			}
--		};
-+
-+            public java.sql.RowId getRowId(int columnIndex) throws SQLException {
-+                return null;
-+            }
-+
-+            public java.sql.RowId getRowId(String columnLabel) throws SQLException {
-+                return null;
-+            }
-+
-+            public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException {
-+            }
-+
-+            public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException {
-+            }
-+
-+            public int getHoldability() throws SQLException {
-+                return 0;
-+            }
-+
-+            public boolean isClosed() throws SQLException {
-+                return false;
-+            }
-+
-+            public void updateNString(int columnIndex, String nString) throws SQLException {
-+            }
-+
-+            public void updateNString(String columnLabel, String nString) throws SQLException {
-+            }
-+
-+            public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException {
-+            }
-+
-+            public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException {
-+            }
-+
-+            public java.sql.NClob getNClob(int columnIndex) throws SQLException {
-+                return null;
-+            }
-+
-+            public java.sql.NClob getNClob(String columnLabel) throws SQLException {
-+                return null;
-+            }
-+
-+            public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException {
-+                return null;
-+            }
-+
-+            public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException {
-+                return null;
-+            }
-+
-+            public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException {
-+            }
-+
-+            public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException {
-+            }
-+
-+            public String getNString(int columnIndex) throws SQLException {
-+                return null;
-+            }
-+
-+            public String getNString(String columnLabel) throws SQLException {
-+                return null;
-+            }
-+
-+            public Reader getNCharacterStream(int columnIndex) throws SQLException {
-+                return null;
-+            }
-+
-+            public Reader getNCharacterStream(String columnLabel) throws SQLException {
-+                return null;
-+            }
-+
-+            public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
-+            }
-+
-+            public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
-+            }
-+
-+            public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
-+            }
-+
-+            public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
-+            }
-+
-+            public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
-+            }
-+
-+            public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
-+            }
-+
-+            public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
-+            }
-+
-+            public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
-+            }
-+
-+            public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
-+            }
-+
-+            public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
-+            }
-+
-+            public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
-+            }
-+
-+            public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
-+            }
-+
-+            public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
-+              
-+            }
-+
-+            public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
-+            }
-+
-+            public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
-+            }
-+
-+            public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
-+            }
-+
-+            public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
-+            }
-+
-+            public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
-+            }
-+
-+            public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
-+            }
-+
-+            public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
-+            }
-+
-+            public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
-+            }
-+
-+            public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
-+            }
-+
-+            public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
-+            }
-+
-+            public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
-+            }
-+
-+            public void updateClob(int columnIndex, Reader reader) throws SQLException {
-+            }
-+
-+            public void updateClob(String columnLabel, Reader reader) throws SQLException {
-+            }
-+
-+            public void updateNClob(int columnIndex, Reader reader) throws SQLException {
-+            }
-+
-+            public void updateNClob(String columnLabel, Reader reader) throws SQLException {
-+            }
-+
-+            public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+                return null;
-+            }
-+
-+            public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+                return null;
-+            }
-+
-+            public <T> T unwrap(Class<T> iface) throws SQLException {
-+                return null;
-+            }
-+
-+            public boolean isWrapperFor(Class<?> iface) throws SQLException {
-+                return false;
-+            }
-+        };
- 	}
- 
- 	/**

Copied: tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch (from rev 17134, trunk/mysql-connector-java/debian/patches/0002-java6-compilation-compat.patch)
===================================================================
--- tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch	                        (rev 0)
+++ tags/mysql-connector-java/5.1.26-1/debian/patches/0002-java6-compilation-compat.patch	2013-08-09 13:19:57 UTC (rev 17135)
@@ -0,0 +1,1196 @@
+Description: This patch adds dummy JDBC4 methods to enable the compilation
+ with Java 6 or 7 and no longer require Java 5
+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 @@
+ 	     * @throws java.sql.SQLException If no object found that implements the interface 
+ 	     * @since 1.6
+ 	     */
+-		public Object unwrap(Class<?> iface) throws java.sql.SQLException {
++        public <T> T unwrap(Class<T> iface) throws SQLException {
+ 	    	try {
+ 	    		// This works for classes that aren't actually wrapping
+ 	    		// anything
+-	    		return Util.cast(iface, this);
++	    		return iface.cast(this);
+ 	        } catch (ClassCastException cce) {
+ 	            throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), 
+ 	            		SQLError.SQL_STATE_ILLEGAL_ARGUMENT, getExceptionInterceptor());
+@@ -2670,4 +2670,76 @@
+ 			}
+ 		}
+ 	}
++
++    public java.sql.RowId getRowId(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.RowId getRowId(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setRowId(String parameterName, java.sql.RowId x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNString(String parameterName, String value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(String parameterName, java.sql.NClob value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.NClob getNClob(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.NClob getNClob(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public String getNString(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public String getNString(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getNCharacterStream(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getCharacterStream(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getCharacterStream(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(String parameterName, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- a/src/com/mysql/jdbc/ConnectionImpl.java
++++ b/src/com/mysql/jdbc/ConnectionImpl.java
+@@ -6107,4 +6107,56 @@
+ 			return getSocketTimeout();
+ 		}
+ 	}
++
++    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();
++    }
+ }
+--- a/src/com/mysql/jdbc/DatabaseMetaData.java
++++ b/src/com/mysql/jdbc/DatabaseMetaData.java
+@@ -8694,4 +8694,20 @@
+             throws SQLException {
+ 		return true;
+ 	}
++
++    public java.sql.RowIdLifetime getRowIdLifetime() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public boolean autoCommitFailureClosesAllResultSets() 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 SQLException();
++    }
+ }
+--- 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) {
+@@ -2643,4 +2643,57 @@
+ 	public String getConnectionAttributes() throws SQLException {
+ 		return getActiveMySQLConnection().getConnectionAttributes();
+ 	}
++
++
++    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();
++    }
+ }
+--- a/src/com/mysql/jdbc/MysqlParameterMetadata.java
++++ b/src/com/mysql/jdbc/MysqlParameterMetadata.java
+@@ -202,11 +202,11 @@
+      * @throws java.sql.SQLException If no object found that implements the interface 
+      * @since 1.6
+      */
+-	public Object unwrap(Class<?> iface) throws java.sql.SQLException {
++    public <T> T unwrap(Class<T> iface) throws SQLException {
+     	try {
+     		// This works for classes that aren't actually wrapping
+     		// anything
+-    		return Util.cast(iface, this);
++    		return iface.cast(this);
+         } catch (ClassCastException cce) {
+             throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), 
+             		SQLError.SQL_STATE_ILLEGAL_ARGUMENT, this.exceptionInterceptor);
+--- a/src/com/mysql/jdbc/NonRegisteringDriver.java
++++ b/src/com/mysql/jdbc/NonRegisteringDriver.java
+@@ -966,4 +966,8 @@
+ 			}
+ 		}
+ 	}
++
++    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++        throw new java.sql.SQLFeatureNotSupportedException();
++    }
+ }
+--- a/src/com/mysql/jdbc/PreparedStatement.java
++++ b/src/com/mysql/jdbc/PreparedStatement.java
+@@ -5759,4 +5759,16 @@
+ 						statementStartPos, sql, "SELECT", "\"'`",
+ 						"\"'`", false) == -1 && rewritableOdku;
+ 	}
++
++    public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- a/src/com/mysql/jdbc/ReplicationConnection.java
++++ b/src/com/mysql/jdbc/ReplicationConnection.java
+@@ -2707,4 +2707,56 @@
+ 	public String getConnectionAttributes() throws SQLException {
+ 		return getCurrentConnection().getConnectionAttributes();
+ 	}
++
++    public Clob createClob() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public 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();
++    }
+ }
+--- a/src/com/mysql/jdbc/ResultSetImpl.java
++++ b/src/com/mysql/jdbc/ResultSetImpl.java
+@@ -8747,4 +8747,204 @@
+ 	protected ExceptionInterceptor getExceptionInterceptor() {
+ 		return this.exceptionInterceptor;
+ 	}
++
++    public java.sql.RowId getRowId(int columnIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.RowId getRowId(String columnLabel) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public int getHoldability() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public boolean isClosed() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNString(int columnIndex, String nString) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNString(String columnLabel, String nString) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.NClob getNClob(int columnIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.NClob getNClob(String columnLabel) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public String getNString(int columnIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public String getNString(String columnLabel) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.io.Reader getNCharacterStream(int columnIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.io.Reader getNCharacterStream(String columnLabel) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateCharacterStream(int columnIndex, java.io.Reader x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateCharacterStream(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateClob(int columnIndex, java.io.Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateClob(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNClob(int columnIndex, java.io.Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNClob(String columnLabel, java.io.Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateCharacterStream(int columnIndex, java.io.Reader x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateCharacterStream(String columnLabel, java.io.Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateClob(int columnIndex, java.io.Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateClob(String columnLabel, java.io.Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNClob(int columnIndex, java.io.Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void updateNClob(String columnLabel, java.io.Reader reader) 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();
++    }
+ }
+--- a/src/com/mysql/jdbc/ResultSetMetaData.java
++++ b/src/com/mysql/jdbc/ResultSetMetaData.java
+@@ -849,11 +849,11 @@
+      * @throws java.sql.SQLException If no object found that implements the interface 
+      * @since 1.6
+      */
+-	public Object unwrap(Class<?> iface) throws java.sql.SQLException {
++    public <T> T unwrap(Class<T> iface) throws SQLException {
+     	try {
+     		// This works for classes that aren't actually wrapping
+     		// anything
+-    		return Util.cast(iface, this);
++    		return iface.cast(this);
+         } catch (ClassCastException cce) {
+             throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(), 
+             		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 @@
+      * @throws java.sql.SQLException If no object found that implements the interface
+      * @since 1.6
+      */
+-	public Object unwrap(Class<?> iface) throws java.sql.SQLException {
++    public <T> T unwrap(Class<T> iface) throws SQLException {
+     	try {
+     		// This works for classes that aren't actually wrapping
+     		// anything
+-            return Util.cast(iface, this);
++            return iface.cast(this);
+         } catch (ClassCastException cce) {
+             throw SQLError.createSQLException("Unable to unwrap to " + iface.toString(),
+             		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 @@
+ //		throw SQLError.notImplemented();
+ //	}
+ 
++    public java.sql.RowId getRowId(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.RowId getRowId(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setRowId(String parameterName, java.sql.RowId x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNString(String parameterName, String value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(String parameterName, java.sql.NClob value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setClob(String parameterName, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.NClob getNClob(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.NClob getNClob(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setSQLXML(String parameterName, java.sql.SQLXML xmlObject) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.SQLXML getSQLXML(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public java.sql.SQLXML getSQLXML(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public String getNString(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public String getNString(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getNCharacterStream(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getNCharacterStream(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getCharacterStream(int parameterIndex) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public Reader getCharacterStream(String parameterName) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBlob(String parameterName, Blob x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setClob(String parameterName, Clob x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setClob(String parameterName, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(String parameterName, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- a/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java
+@@ -2842,7 +2842,59 @@
+ 		return this.mc.getConnectionMutex();
+ 	}
+ 
+-	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();
++    }
++
++    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();
++    }
++}
+--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java
+@@ -450,4 +450,16 @@
+ //	public <T> T unwrap(Class<T> iface) throws SQLException {
+ //		throw SQLError.notImplemented();
+ //	}
++    
++    public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++        throw new java.sql.SQLFeatureNotSupportedException();
++    }
++
++    public <T> T unwrap(Class<T> iface) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public boolean isWrapperFor(Class<?> iface) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- a/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java
+@@ -254,4 +254,12 @@
+ 	protected ExceptionInterceptor getExceptionInterceptor() {
+ 		return this.exceptionInterceptor;
+ 	}
++
++    public void addStatementEventListener(javax.sql.StatementEventListener listener) {
++        throw new UnsupportedOperationException();
++    }
++
++    public void removeStatementEventListener(javax.sql.StatementEventListener listener) {
++        throw new UnsupportedOperationException();
++    }
+ }
+\ 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 @@
+ //	public Object unwrap(Class arg0) throws SQLException {
+ //		throw SQLError.notImplemented();
+ //	}
++    
++    public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNString(int parameterIndex, String value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setClob(int parameterIndex, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
+ }
+--- a/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
++++ b/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java
+@@ -866,4 +866,32 @@
+ 			checkAndFireConnectionError(sqlEx);
+ 		}
+ 	}
++
++    public boolean isClosed() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void setPoolable(boolean poolable) throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public boolean isPoolable() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public void closeOnCompletion() throws SQLException {
++        throw new UnsupportedOperationException();
++    }
++
++    public boolean isCloseOnCompletion() 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();
++    }
+ }
+--- a/src/testsuite/regression/StatementRegressionTest.java
++++ b/src/testsuite/regression/StatementRegressionTest.java
+@@ -2542,7 +2542,7 @@
+ 		try {
+ 			pStmt = this.conn
+ 					.prepareStatement("INSERT INTO testNullClob VALUES (?)");
+-			pStmt.setClob(1, null);
++			pStmt.setClob(1, (Clob) null);
+ 			pStmt.executeUpdate();
+ 		} finally {
+ 			if (pStmt != null) {
+@@ -5272,7 +5272,180 @@
+ 			public int getBytesSize() throws SQLException {
+ 				return 0;
+ 			}
+-		};
++
++            public java.sql.RowId getRowId(int columnIndex) throws SQLException {
++                return null;
++            }
++
++            public java.sql.RowId getRowId(String columnLabel) throws SQLException {
++                return null;
++            }
++
++            public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException {
++            }
++
++            public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException {
++            }
++
++            public int getHoldability() throws SQLException {
++                return 0;
++            }
++
++            public boolean isClosed() throws SQLException {
++                return false;
++            }
++
++            public void updateNString(int columnIndex, String nString) throws SQLException {
++            }
++
++            public void updateNString(String columnLabel, String nString) throws SQLException {
++            }
++
++            public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException {
++            }
++
++            public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException {
++            }
++
++            public java.sql.NClob getNClob(int columnIndex) throws SQLException {
++                return null;
++            }
++
++            public java.sql.NClob getNClob(String columnLabel) throws SQLException {
++                return null;
++            }
++
++            public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException {
++                return null;
++            }
++
++            public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException {
++                return null;
++            }
++
++            public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException {
++            }
++
++            public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException {
++            }
++
++            public String getNString(int columnIndex) throws SQLException {
++                return null;
++            }
++
++            public String getNString(String columnLabel) throws SQLException {
++                return null;
++            }
++
++            public Reader getNCharacterStream(int columnIndex) throws SQLException {
++                return null;
++            }
++
++            public Reader getNCharacterStream(String columnLabel) throws SQLException {
++                return null;
++            }
++
++            public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
++            }
++
++            public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++            }
++
++            public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
++            }
++
++            public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
++            }
++
++            public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
++            }
++
++            public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
++            }
++
++            public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
++            }
++
++            public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
++            }
++
++            public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
++            }
++
++            public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
++            }
++
++            public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
++            }
++
++            public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
++            }
++
++            public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
++              
++            }
++
++            public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
++            }
++
++            public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
++            }
++
++            public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
++            }
++
++            public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
++            }
++
++            public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
++            }
++
++            public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
++            }
++
++            public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
++            }
++
++            public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
++            }
++
++            public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
++            }
++
++            public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
++            }
++
++            public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
++            }
++
++            public void updateClob(int columnIndex, Reader reader) throws SQLException {
++            }
++
++            public void updateClob(String columnLabel, Reader reader) throws SQLException {
++            }
++
++            public void updateNClob(int columnIndex, Reader reader) throws SQLException {
++            }
++
++            public void updateNClob(String columnLabel, Reader reader) throws SQLException {
++            }
++
++            public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++                return null;
++            }
++
++            public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++                return null;
++            }
++
++            public <T> T unwrap(Class<T> iface) throws SQLException {
++                return null;
++            }
++
++            public boolean isWrapperFor(Class<?> iface) throws SQLException {
++                return false;
++            }
++        };
+ 	}
+ 
+ 	/**

Deleted: tags/mysql-connector-java/5.1.26-1/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules	2013-08-08 11:25:04 UTC (rev 17133)
+++ tags/mysql-connector-java/5.1.26-1/debian/rules	2013-08-09 13:19:57 UTC (rev 17135)
@@ -1,27 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api
-DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA_HOME)/bin/javac \
-    -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/jre/lib/rt.jar \
-    -Dsnapshot.version=
-
-binary-post-install/libmysql-java::
-	mh_installpoms -plibmysql-java -e$(VERSION)
-	mh_installjar -plibmysql-java -e$(VERSION) -l src/doc/sources/pom.xml build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar
-	# compat link?
-	dh_link -plibmysql-java usr/share/java/mysql-connector-java.jar usr/share/java/mysql.jar
-
-clean::
-	rm -rf dist
-	rm -f build-stamp
-	mh_clean
-
-get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Copied: tags/mysql-connector-java/5.1.26-1/debian/rules (from rev 17134, trunk/mysql-connector-java/debian/rules)
===================================================================
--- tags/mysql-connector-java/5.1.26-1/debian/rules	                        (rev 0)
+++ tags/mysql-connector-java/5.1.26-1/debian/rules	2013-08-09 13:19:57 UTC (rev 17135)
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/Version: //' | cut -f1 -d- | cut -f1 -d+)
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_JARS := ant ant-launcher ant-junit junit ant-contrib slf4j-api
+DEB_ANT_ARGS := -Dcom.mysql.jdbc.java6.javac=$(JAVA_HOME)/bin/javac \
+    -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/jre/lib/rt.jar \
+    -Dsnapshot.version= \
+    -Dant.build.javac.source=1.6 \
+    -Dant.build.javac.target=1.6
+
+binary-post-install/libmysql-java::
+	mh_installpoms -plibmysql-java -e$(VERSION)
+	mh_installjar -plibmysql-java -e$(VERSION) -l src/doc/sources/pom.xml build/mysql-connector-java-$(VERSION)/mysql-connector-java-$(VERSION)-bin.jar
+	# compat link?
+	dh_link -plibmysql-java usr/share/java/mysql-connector-java.jar usr/share/java/mysql.jar
+
+clean::
+	rm -rf dist
+	rm -f build-stamp
+	mh_clean
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename




More information about the pkg-java-commits mailing list