mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +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:
@@ -1145,20 +1145,18 @@ runUniqueNullTransactions(NDBT_Context* ctx, NDBT_Step* step){
|
||||
pTrans = pNdb->startTransaction();
|
||||
NdbScanOperation * sOp;
|
||||
NdbOperation * uOp;
|
||||
NdbResultSet * rs;
|
||||
int eof;
|
||||
if(!pTrans) goto done;
|
||||
sOp = pTrans->getNdbScanOperation(pTab->getName());
|
||||
if(!sOp) goto done;
|
||||
rs = sOp->readTuples(NdbScanOperation::LM_Exclusive);
|
||||
if(!rs) goto done;
|
||||
if(sOp->readTuples(NdbScanOperation::LM_Exclusive)) goto done;
|
||||
if(pTrans->execute(NoCommit) == -1) goto done;
|
||||
while((eof = rs->nextResult(true)) == 0){
|
||||
while((eof = sOp->nextResult(true)) == 0){
|
||||
do {
|
||||
NdbOperation * uOp = rs->updateTuple();
|
||||
NdbOperation * uOp = sOp->updateCurrentTuple();
|
||||
if(uOp == 0) goto done;
|
||||
uOp->setValue(colId, 0);
|
||||
} while((eof = rs->nextResult(false)) == 0);
|
||||
} while((eof = sOp->nextResult(false)) == 0);
|
||||
eof = pTrans->execute(Commit);
|
||||
if(eof == -1) goto done;
|
||||
}
|
||||
|
Reference in New Issue
Block a user