Connector/J commit: r6680 - branches/branch_5_1/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java
   branches/branch_5_1/src/com/mysql/jdbc/DatabaseMetaData.java
Log:
Don't try and create info-schema based DBMD instances for internal use.

Modified: branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java	2007-11-19 02:13:27 UTC (rev 6679)
+++ branches/branch_5_1/src/com/mysql/jdbc/ConnectionImpl.java	2007-11-19 02:16:08 UTC (rev 6680)
@@ -727,7 +727,7 @@
 		initializeDriverProperties(info);
 
 		try {
-			this.dbmd = getMetaData(false);
+			this.dbmd = getMetaData(false, false);
 			createNewIO(false);
 		} catch (SQLException ex) {
 			cleanup(ex);
@@ -2988,15 +2988,15 @@
 	 *                if a database access error occurs
 	 */
 	public java.sql.DatabaseMetaData getMetaData() throws SQLException {
-		return getMetaData(true);
+		return getMetaData(true, true);
 	}
 	
-	private java.sql.DatabaseMetaData getMetaData(boolean checkClosed) throws SQLException {
+	private java.sql.DatabaseMetaData getMetaData(boolean checkClosed, boolean checkForInfoSchema) throws SQLException {
 		if (checkClosed) {
 			checkClosed();	
 		}
 		
-		return com.mysql.jdbc.DatabaseMetaData.getInstance(this, this.database);
+		return com.mysql.jdbc.DatabaseMetaData.getInstance(this, this.database, checkForInfoSchema);
 	}
 
 	protected java.sql.Statement getMetadataSafeStatement() throws SQLException {

Modified: branches/branch_5_1/src/com/mysql/jdbc/DatabaseMetaData.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/DatabaseMetaData.java	2007-11-19 02:13:27 UTC (rev 6679)
+++ branches/branch_5_1/src/com/mysql/jdbc/DatabaseMetaData.java	2007-11-19 02:16:08 UTC (rev 6680)
@@ -620,10 +620,11 @@
 	// and JDBC4 runtimes, otherwise the class verifier complains...
 	
 	protected static DatabaseMetaData getInstance(
-			ConnectionImpl connToSet, String databaseToSet)
+			ConnectionImpl connToSet, String databaseToSet, boolean checkForInfoSchema)
 			throws SQLException {
 		if (!Util.isJdbc4()) {
-			if (connToSet != null && connToSet.getUseInformationSchema()
+			if (checkForInfoSchema && connToSet != null 
+					&& connToSet.getUseInformationSchema()
 					&& connToSet.versionMeetsMinimum(5, 0, 7)) {
 				return new DatabaseMetaDataUsingInfoSchema(connToSet,
 						databaseToSet);