Commit fde02a80 authored by unknown's avatar unknown
Browse files

ndb - 

  minor fixes in test programs


ndb/src/kernel/blocks/ERROR_codes.txt:
  Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
  Fix test program
parent 2279f08a

ndb/src/kernel/blocks/ERROR_codes.txt

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ LQH: 
5026  Crash when receiving COPY_ACTIVEREQ

5027  Crash when receiving STAT_RECREQ



5042  Crash starting node, when scan is finished on primary replica

5043  Crash starting node, when scan is finished on primary replica



Test Crashes in handling take over

----------------------------------

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -9221,7 +9221,7 @@ void Dblqh::nextScanConfCopyLab(Signal* signal) 
/*---------------------------------------------------------------------------*/

    scanptr.p->scanCompletedStatus = ZTRUE;

    scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;

    if (ERROR_INSERTED(5042))

    if (ERROR_INSERTED(5043))

    {

      CLEAR_ERROR_INSERT_VALUE;

      tcConnectptr.p->copyCountWords = ~0;

ndb/test/ndbapi/testNodeRestart.cpp

+8 −0
Original line number Diff line number Diff line
@@ -439,6 +439,14 @@ int runBug15587(NDBT_Context* ctx, NDBT_Step* step){ 
  if (restarter.startNodes(&nodeId, 1))

    return NDBT_FAILED;



  restarter.waitNodesStartPhase(&nodeId, 1, 3);

  

  if (restarter.waitNodesNoStart(&nodeId, 1))

    return NDBT_FAILED; 

   

  if (restarter.startNodes(&nodeId, 1))

    return NDBT_FAILED;

  

  if (restarter.waitNodesStarted(&nodeId, 1))

    return NDBT_FAILED;