Connector/J commit: r5888 - branches/branch_3_1/connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_3_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java
Log:
Cleanup of usage of prepared statement rather than regular statement references.

Modified: branches/branch_3_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java
===================================================================
--- branches/branch_3_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java	2006-10-18 00:03:38 UTC (rev 5887)
+++ branches/branch_3_1/connector-j/src/com/mysql/jdbc/DatabaseMetaData.java	2006-10-18 15:40:15 UTC (rev 5888)
@@ -1153,8 +1153,6 @@
 		// First try 'select from mysql.proc, as this is easier to parse...
 		String parameterDef = null;
 
-		PreparedStatement paramRetrievalPreparedStatement = null;
-		
 		try {
 			paramRetrievalStmt = this.conn.getMetadataSafeStatement();
 			
@@ -1352,16 +1350,6 @@
 				paramRetrievalRs = null;
 			}
 
-			if (paramRetrievalPreparedStatement != null) {
-				try {
-					paramRetrievalPreparedStatement.close();
-				} catch (SQLException sqlEx) {
-					sqlExRethrow = sqlEx;
-				}
-
-				paramRetrievalPreparedStatement = null;
-			}
-
 			if (paramRetrievalStmt != null) {
 				try {
 					paramRetrievalStmt.close();
@@ -3588,7 +3576,7 @@
 					&& (procedureNamePattern.indexOf("?") == -1)) {
 				proceduresToExtractList.add(procedureNamePattern);
 			} else {
-				PreparedStatement procedureNameStmt = null;
+				Statement procedureNameStmt = null;
 				ResultSet procedureNameRs = null;
 
 				try {