Connector/J commit: r4909 - branches/branch_5_0/connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/NonRegisteringDriver.java
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/PreparedStatement.java
Log:
Fixed up method arguments.

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/NonRegisteringDriver.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/NonRegisteringDriver.java	2006-02-07 22:48:22 UTC (rev 4908)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/NonRegisteringDriver.java	2006-02-07 22:53:22 UTC (rev 4909)
@@ -264,7 +264,7 @@
 
 		try {
 			Connection newConn = new com.mysql.jdbc.Connection(host(props),
-					port(props), props, database(props), url, this);
+					port(props), props, database(props), url);
 
 			return newConn;
 		} catch (SQLException sqlEx) {

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2006-02-07 22:48:22 UTC (rev 4908)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2006-02-07 22:53:22 UTC (rev 4909)
@@ -739,7 +739,7 @@
 									"SET OPTION SQL_SELECT_LIMIT=DEFAULT", -1, //$NON-NLS-1$
 									null, java.sql.ResultSet.TYPE_FORWARD_ONLY,
 									java.sql.ResultSet.CONCUR_READ_ONLY, false,
-									false, this.currentCatalog, true);
+									this.currentCatalog, true);
 						} else {
 							this.connection
 									.execSQL(
@@ -748,7 +748,7 @@
 											null,
 											java.sql.ResultSet.TYPE_FORWARD_ONLY,
 											java.sql.ResultSet.CONCUR_READ_ONLY,
-											false, false, this.currentCatalog,
+											false, this.currentCatalog,
 											true);
 						}
 					}
@@ -756,7 +756,7 @@
 					this.connection.execSQL(this,
 							"SET OPTION SQL_SELECT_LIMIT=DEFAULT", -1, null, //$NON-NLS-1$
 							java.sql.ResultSet.TYPE_FORWARD_ONLY,
-							java.sql.ResultSet.CONCUR_READ_ONLY, false, false,
+							java.sql.ResultSet.CONCUR_READ_ONLY, false,
 							this.currentCatalog, true);
 				}
 
@@ -942,8 +942,8 @@
 			
 			rs = this.connection.execSQL(this, null, maxRowsToRetrieve, sendPacket,
 				this.resultSetType, this.resultSetConcurrency,
-				createStreamingResultSet, false, this.currentCatalog,
-				unpackFields, USES_VARIABLES_UNKNOWN, isBatch);
+				createStreamingResultSet, this.currentCatalog,
+				unpackFields, isBatch);
 		
 			if (this.wasCancelled) {
 				this.wasCancelled = false;
@@ -1026,7 +1026,7 @@
 										"SET OPTION SQL_SELECT_LIMIT=DEFAULT", -1, null, //$NON-NLS-1$
 										java.sql.ResultSet.TYPE_FORWARD_ONLY,
 										java.sql.ResultSet.CONCUR_READ_ONLY,
-										false, false, this.currentCatalog, true);
+										false, this.currentCatalog, true);
 					} else {
 						this.connection
 								.execSQL(
@@ -1034,7 +1034,7 @@
 										"SET OPTION SQL_SELECT_LIMIT=" + this.maxRows, -1, null, //$NON-NLS-1$
 										java.sql.ResultSet.TYPE_FORWARD_ONLY,
 										java.sql.ResultSet.CONCUR_READ_ONLY,
-										false, false, this.currentCatalog, true);
+										false, this.currentCatalog, true);
 					}
 
 					this.results = executeInternal(-1, sendPacket,
@@ -1170,7 +1170,7 @@
 				this.connection.execSQL(this,
 						"SET OPTION SQL_SELECT_LIMIT=DEFAULT", -1, null, //$NON-NLS-1$
 						java.sql.ResultSet.TYPE_FORWARD_ONLY,
-						java.sql.ResultSet.CONCUR_READ_ONLY, false, false,
+						java.sql.ResultSet.CONCUR_READ_ONLY, false,
 						this.currentCatalog, true);
 			}