At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge
------------------------------------------------------------
revno: 179
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Thu 2007-10-11 01:12:14 -0700
message:
Fixed more scan nextResult issues. Made a nextResult() call nextResult(true)
modified:
java/com/mysql/cluster/ndbj/NdbResultSetImpl.java
ndbresultsetimpl.jav-20070517181935-98huwjarzuh25b30-22
java/testsuite/ndbj/MultiPartPrimaryKeyStringTest.java
multipartprimarykeys-20070517181935-98huwjarzuh25b30-49
=== modified file 'java/com/mysql/cluster/ndbj/NdbResultSetImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbResultSetImpl.java 2007-10-11 07:35:31 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbResultSetImpl.java 2007-10-11 08:12:14 +0000
@@ -217,6 +217,9 @@
* @see com.mysql.cluster.ndbj.NdbResultSet#next()
*/
public boolean next() throws NdbApiException {
+ return next(true);
+ }
+ /*
// TODO: Please double check me
if (op == null) {
throw new NdbApiException("NdbResultSet.next() "
@@ -251,13 +254,13 @@
hasData = true;
} else if (scanCheck == 2) {
if (rowsModified) {
- /* TODO: FIX This section - we're not storing an NdbTransaction within NdbScanOp any
more
+ TODO: FIX This section - we're not storing an NdbTransaction within NdbScanOp any
more
NdbTransaction trans = null;
trans = ((NdbScanOperationImpl)theOp).getNdbTransaction();
trans.execute(ExecType.NoCommit,
AbortOption.AbortOnError, true);
- rowsModified = false; */
+ rowsModified = false;
}
return next();
} else if (scanCheck == 1) {
@@ -273,7 +276,7 @@
return false;
}
}
-
+*/
/**
* @see com.mysql.cluster.ndbj.NdbResultSet#deleteRow()
*/
=== modified file 'java/testsuite/ndbj/MultiPartPrimaryKeyStringTest.java'
--- a/java/testsuite/ndbj/MultiPartPrimaryKeyStringTest.java 2007-10-11 08:04:55 +0000
+++ b/java/testsuite/ndbj/MultiPartPrimaryKeyStringTest.java 2007-10-11 08:12:14 +0000
@@ -188,7 +188,7 @@
true);
int numRes = 0;
- while(rs.next(true))
+ while(rs.next())
{
numRes++;
Thread |
---|
• Rev 179: Fixed more scan nextResult issues. Made a nextResult() call nextResult(true) in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/nd... | Monty Taylor | 11 Oct |