Commit c9f7d224 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

ndb - more test prg fixes (due to small change in scanUpdates impl.) 

  (autotest tests)
parent 1d1b95f0

storage/ndb/test/ndbapi/testDict.cpp

+2 −2
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ int runTestFragmentTypes(NDBT_Context* ctx, NDBT_Step* step){ 
    CHECK(utilTrans.selectCount(pNdb, 64, &count) == 0);

    CHECK(count == records);

    CHECK(hugoTrans.pkDelRecords(pNdb, records/2) == 0);

    CHECK(hugoTrans.scanUpdateRecords(pNdb, records) == 0);

    CHECK(hugoTrans.scanUpdateRecords(pNdb, records/2) == 0);

    CHECK(utilTrans.selectCount(pNdb, 64, &count) == 0);

    CHECK(count == (records/2));
@@ -857,7 +857,7 @@ int runPkSizes(NDBT_Context* ctx, NDBT_Step* step){ 
      CHECK(utilTrans.selectCount(pNdb, 64, &count) == 0);

      CHECK(count == records);

      CHECK(hugoTrans.pkDelRecords(pNdb, records/2) == 0);

      CHECK(hugoTrans.scanUpdateRecords(pNdb, records) == 0);

      CHECK(hugoTrans.scanUpdateRecords(pNdb, records/2) == 0);

      CHECK(utilTrans.selectCount(pNdb, 64, &count) == 0);

      CHECK(count == (records/2));

      CHECK(utilTrans.clearTable(pNdb, records) == 0);

storage/ndb/test/ndbapi/testIndex.cpp

+2 −2
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ int runSystemRestart1(NDBT_Context* ctx, NDBT_Step* step){ 
    CHECK(hugoTrans.pkUpdateRecords(pNdb, records) == 0);

    CHECK(utilTrans.verifyIndex(pNdb, idxName, 16, false) == 0);

    CHECK(hugoTrans.pkDelRecords(pNdb, records/2) == 0);

    CHECK(hugoTrans.scanUpdateRecords(pNdb, records) == 0);

    CHECK(hugoTrans.scanUpdateRecords(pNdb, records/2) == 0);

    CHECK(utilTrans.verifyIndex(pNdb, idxName, 16, false) == 0);

    CHECK(utilTrans.clearTable(pNdb, records) == 0);

    CHECK(hugoTrans.loadTable(pNdb, records, 1) == 0);
@@ -834,7 +834,7 @@ int runSystemRestart1(NDBT_Context* ctx, NDBT_Step* step){ 
    CHECK(utilTrans.verifyIndex(pNdb, idxName,  16, false) == 0);

    CHECK(hugoTrans.pkDelRecords(pNdb, records/2) == 0);

    CHECK(utilTrans.verifyIndex(pNdb, idxName,  16, false) == 0);

    CHECK(hugoTrans.scanUpdateRecords(pNdb, records) == 0);

    CHECK(hugoTrans.scanUpdateRecords(pNdb, records/2) == 0);

    CHECK(utilTrans.verifyIndex(pNdb, idxName,  16, false) == 0);

    CHECK(utilTrans.clearTable(pNdb, records) == 0);

    CHECK(hugoTrans.loadTable(pNdb, records, 1) == 0);

storage/ndb/test/ndbapi/test_event.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ runScanUpdateUntilStopped(NDBT_Context* ctx, NDBT_Step* step){ 
  HugoTransactions hugoTrans(*ctx->getTab());

  while (ctx->isTestStopped() == false) 

  {

    if (hugoTrans.scanUpdateRecords(GETNDB(step), records, abort, 

    if (hugoTrans.scanUpdateRecords(GETNDB(step), 0, abort, 

				    parallelism) == NDBT_FAILED){

      return NDBT_FAILED;

    }