Commit 68b8afe1 authored by unknown's avatar unknown
Browse files

ndb - bug#21213 

  5.1-fix adopt to changes in node recovery


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  ix totSendLenAi also in "new" node recovery
parent 7542d1f7

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

+3 −2
Original line number Diff line number Diff line
@@ -3831,6 +3831,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal) 
  } 

  else if (activeCreat == Fragrecord::AC_NR_COPY)

  {

    regTcPtr->totSendlenAi = regTcPtr->totReclenAi;

    handle_nr_copy(signal, tcConnectptr);

  }

  else
@@ -3846,6 +3847,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal) 
    EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);

    jamEntry();









    regTcPtr->totSendlenAi = regTcPtr->totReclenAi;









    packLqhkeyreqLab(signal);









  }









}








@@ -7180,7 +7182,6 @@ void Dblqh::execACC_ABORTCONF(Signal* signal)







  signal->theData[0] = regTcPtr->tupConnectrec;









  EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);









  









  regTcPtr->totSendlenAi = regTcPtr->totReclenAi;









  continueAbortLab(signal);









  return;









}//Dblqh::execACC_ABORTCONF()