Modified:
trunk/src/com/mysql/jdbc/MysqlIO.java
trunk/src/com/mysql/jdbc/MysqlIOprotocol.java
Log:
readAllResults now returns the ResultSetInternalMethods interface, not the ResultSetImpl concrete class
Modified: trunk/src/com/mysql/jdbc/MysqlIO.java
===================================================================
--- trunk/src/com/mysql/jdbc/MysqlIO.java 2008-03-06 18:21:53 UTC (rev 6760)
+++ trunk/src/com/mysql/jdbc/MysqlIO.java 2008-03-13 14:05:22 UTC (rev 6761)
@@ -9,10 +9,11 @@
void doHandshake(String user, String password, String database)
throws SQLException;
- ResultSetImpl readAllResults(StatementImpl callingStatement, int maxRows,
- int resultSetType, int resultSetConcurrency, boolean streamResults,
- String catalog, Buffer resultPacket, boolean isBinaryEncoded,
- long preSentColumnCount, Field[] metadataFromCache) throws SQLException;
+ ResultSetInternalMethods readAllResults(StatementImpl callingStatement,
+ int maxRows, int resultSetType, int resultSetConcurrency,
+ boolean streamResults, String catalog, Buffer resultPacket,
+ boolean isBinaryEncoded, long preSentColumnCount,
+ Field[] metadataFromCache) throws SQLException;
ResultSetRow nextRow(Field[] fields, int columnCount,
boolean isBinaryEncoded, int resultSetConcurrency,
Modified: trunk/src/com/mysql/jdbc/MysqlIOprotocol.java
===================================================================
--- trunk/src/com/mysql/jdbc/MysqlIOprotocol.java 2008-03-06 18:21:53 UTC (rev 6760)
+++ trunk/src/com/mysql/jdbc/MysqlIOprotocol.java 2008-03-13 14:05:22 UTC (rev 6761)
@@ -1737,11 +1737,13 @@
return false;
}
- public ResultSetImpl readAllResults(StatementImpl callingStatement, int maxRows,
- int resultSetType, int resultSetConcurrency, boolean streamResults,
- String catalog, Buffer resultPacket, boolean isBinaryEncoded,
- long preSentColumnCount, Field[] metadataFromCache)
- throws SQLException {
+ public ResultSetInternalMethods readAllResults(
+ StatementImpl callingStatement, int maxRows, int resultSetType,
+ int resultSetConcurrency, boolean streamResults, String catalog,
+ Buffer resultPacket, boolean isBinaryEncoded,
+ long preSentColumnCount, Field[] metadataFromCache)
+ throws SQLException {
+
resultPacket.setPosition(resultPacket.getPosition() - 1);
ResultSetImpl topLevelResultSet = readResultsForQueryOrUpdate(callingStatement,
| Thread |
|---|
| • Connector/J commit: r6761 - trunk/src/com/mysql/jdbc | eherman | 13 Mar |