mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
wl2126 - ndb - fix last unhandled part of read_multi_range
reading sorted multi_range with several range-scans BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6: Delete: ndb/include/ndbapi/NdbResultSet.hpp BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d: Delete: ndb/src/ndbapi/NdbResultSet.cpp ndb/include/ndbapi/NdbApi.hpp: Remove NdbResultSet ndb/include/ndbapi/NdbIndexScanOperation.hpp: Remove NdbResultSet ndb/include/ndbapi/NdbScanOperation.hpp: Remove NdbResultSet ndb/src/ndbapi/Makefile.am: Remove NdbResultSet ndb/src/ndbapi/NdbConnection.cpp: Remove NdbResultSet ndb/src/ndbapi/NdbIndexOperation.cpp: Remove NdbResultSet ndb/src/ndbapi/NdbScanOperation.cpp: Remove NdbResultSet ndb/test/include/HugoOperations.hpp: Remove NdbResultSet ndb/test/ndbapi/ScanFunctions.hpp: Remove NdbResultSet ndb/test/ndbapi/ScanInterpretTest.hpp: Remove NdbResultSet ndb/test/ndbapi/bank/Bank.cpp: Remove NdbResultSet ndb/test/ndbapi/bank/BankLoad.cpp: Remove NdbResultSet ndb/test/ndbapi/slow_select.cpp: Remove NdbResultSet ndb/test/ndbapi/testBlobs.cpp: Remove NdbResultSet ndb/test/ndbapi/testDataBuffers.cpp: Remove NdbResultSet ndb/test/ndbapi/testDeadlock.cpp: Remove NdbResultSet ndb/test/ndbapi/testIndex.cpp: Remove NdbResultSet ndb/test/ndbapi/testOIBasic.cpp: Remove NdbResultSet ndb/test/ndbapi/testReadPerf.cpp: Remove NdbResultSet ndb/test/ndbapi/testScan.cpp: Remove NdbResultSet ndb/test/ndbapi/testScanPerf.cpp: Remove NdbResultSet ndb/test/src/HugoOperations.cpp: Remove NdbResultSet ndb/test/src/HugoTransactions.cpp: Remove NdbResultSet ndb/test/src/UtilTransactions.cpp: Remove NdbResultSet ndb/tools/delete_all.cpp: Remove NdbResultSet ndb/tools/select_all.cpp: Remove NdbResultSet ndb/tools/select_count.cpp: Remove NdbResultSet sql/ha_ndbcluster.cc: 1) Fix a = 3 -> a= 3 2) Impl. last part of wl2126 ordered "multi ordered scan"
This commit is contained in:
@ -443,9 +443,9 @@ testcase(int flag)
|
||||
if ((con = ndb->startTransaction()) == 0)
|
||||
return ndberror("startTransaction key=%d", key);
|
||||
if ((op = sop = con->getNdbScanOperation(tab)) == 0)
|
||||
return ndberror("getNdbOperation key=%d", key);
|
||||
if ((rs = sop->readTuples(1)) == 0)
|
||||
return ndberror("openScanRead key=%d", key);
|
||||
return ndberror("getNdbOperation key=%d", key);
|
||||
if (sop->readTuples(1))
|
||||
return ndberror("openScanRead key=%d", key);
|
||||
{
|
||||
col& c = ccol[0];
|
||||
if (op->load_const_u32(1, key) < 0)
|
||||
@ -488,7 +488,7 @@ testcase(int flag)
|
||||
if (con->execute(NoCommit) < 0)
|
||||
return ndberror("executeScan key=%d", key);
|
||||
int ret, cnt = 0;
|
||||
while ((ret = rs->nextResult()) == 0) {
|
||||
while ((ret = sop->nextResult()) == 0) {
|
||||
if (key != newkey)
|
||||
return ndberror("unexpected key=%d newkey=%d", key, newkey);
|
||||
for (i = 1; i < attrcnt; i++) {
|
||||
|
Reference in New Issue
Block a user