=== modified file 'src/com/mysql/jdbc/ConnectionImpl.java'
--- src/com/mysql/jdbc/ConnectionImpl.java	2010-06-07 21:57:03 +0000
+++ src/com/mysql/jdbc/ConnectionImpl.java	2010-06-15 00:44:33 +0000
@@ -28,6 +28,7 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.nio.ByteBuffer;
@@ -5064,8 +5065,14 @@
 	/**
 	 * @see Connection#setHoldability(int)
 	 */
-	public void setHoldability(int arg0) throws SQLException {
-		// do nothing
+	public void setHoldability(int holdability) throws SQLException {
+		if (holdability != ResultSet.CLOSE_CURSORS_AT_COMMIT) {
+			String requested = (holdability==ResultSet.HOLD_CURSORS_OVER_COMMIT)?
+					"HOLD_CURSORS_OVER_COMMIT":String.valueOf(holdability);
+			throw SQLError.createSQLException(requested,
+					SQLError.SQL_STATE_FEATURE_NOT_SUPPORTED, 
+					0, getExceptionInterceptor());
+		}
 	}
 
 	public void setInGlobalTx(boolean flag) {

=== modified file 'src/com/mysql/jdbc/DatabaseMetaData.java'
--- src/com/mysql/jdbc/DatabaseMetaData.java	2010-04-06 17:20:14 +0000
+++ src/com/mysql/jdbc/DatabaseMetaData.java	2010-06-15 00:11:04 +0000
@@ -7866,7 +7866,7 @@
 	 */
 	public boolean supportsResultSetHoldability(int holdability)
 			throws SQLException {
-		return (holdability == ResultSet.HOLD_CURSORS_OVER_COMMIT);
+		return (holdability == ResultSet.CLOSE_CURSORS_AT_COMMIT);
 	}
 
 	/**

=== modified file 'src/com/mysql/jdbc/SQLError.java'
--- src/com/mysql/jdbc/SQLError.java	2010-03-02 23:09:37 +0000
+++ src/com/mysql/jdbc/SQLError.java	2010-06-14 23:23:47 +0000
@@ -137,6 +137,8 @@
 
 	public static final String SQL_STATE_INVALID_TRANSACTION_TERMINATION = "2D000"; // $NON_NLS-1$
 
+	public static final String SQL_STATE_FEATURE_NOT_SUPPORTED = "0A000"; // $NON_NLS-1$
+
 	private static Map sqlStateMessages;
 
 	private static final long DEFAULT_WAIT_TIMEOUT_SECONDS = 28800;
@@ -147,8 +149,10 @@
 
 	private static final int DUE_TO_TIMEOUT_TRUE = 1;
 	
-	private static final Constructor JDBC_4_COMMUNICATIONS_EXCEPTION_CTOR;
+	private static final Constructor<?> JDBC_4_COMMUNICATIONS_EXCEPTION_CTOR;
 	
+	private static final Constructor<?> JDBC4_SQL_FEATURE_NOT_SUPPORTED_EXCEPTION_CTOR;
+
 	private static Method THROWABLE_INIT_CAUSE_METHOD;
 	
 	static {
@@ -158,6 +162,10 @@
 						"com.mysql.jdbc.exceptions.jdbc4.CommunicationsException")
 						.getConstructor(
 								new Class[] { MySQLConnection.class, Long.TYPE, Long.TYPE, Exception.class });
+				JDBC4_SQL_FEATURE_NOT_SUPPORTED_EXCEPTION_CTOR = Class.forName(
+						"java.sql.SQLFeatureNotSupportedException")
+						.getConstructor(
+								new Class[] {String.class, String.class, Integer.TYPE});
 			} catch (SecurityException e) {
 				throw new RuntimeException(e);
 			} catch (NoSuchMethodException e) {
@@ -167,6 +175,7 @@
 			}
 		} else {
 			JDBC_4_COMMUNICATIONS_EXCEPTION_CTOR = null;
+			JDBC4_SQL_FEATURE_NOT_SUPPORTED_EXCEPTION_CTOR = null;
 		}
 		
 		try {
@@ -922,6 +931,7 @@
 	 * SQL State Class SQLTransientException Subclass 08
 	 * SQLTransientConnectionException 40 SQLTransactionRollbackException N/A
 	 * SQLTimeoutException
+	 * SQLFeatureNotSupportedException A0
 	 */
 
 	public static SQLException createSQLException(String message,
@@ -1071,6 +1081,14 @@
 											message, sqlState,
 											Constants.integerValueOf(vendorErrorCode) }, interceptor);
 					}
+				} else if (sqlState.startsWith("A0")) {
+					if (!Util.isJdbc4()) {
+						sqlEx = new SQLException(message, sqlState, vendorErrorCode);
+					} else {
+						sqlEx = (SQLException) Util.handleNewInstance(JDBC_4_COMMUNICATIONS_EXCEPTION_CTOR,
+								new Object[] {message, sqlState, vendorErrorCode}, interceptor);
+						
+					}
 				} else {
 					sqlEx = new SQLException(message, sqlState, vendorErrorCode);
 				}