Commit 68b8afe1 authored by unknown's avatar unknown

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
...@@ -3831,6 +3831,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal) ...@@ -3831,6 +3831,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
} }
else if (activeCreat == Fragrecord::AC_NR_COPY) else if (activeCreat == Fragrecord::AC_NR_COPY)
{ {
regTcPtr->totSendlenAi = regTcPtr->totReclenAi;
handle_nr_copy(signal, tcConnectptr); handle_nr_copy(signal, tcConnectptr);
} }
else else
...@@ -3845,7 +3846,8 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal) ...@@ -3845,7 +3846,8 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
signal->theData[0] = regTcPtr->tupConnectrec; signal->theData[0] = regTcPtr->tupConnectrec;
EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1); EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);
jamEntry(); jamEntry();
regTcPtr->totSendlenAi = regTcPtr->totReclenAi;
packLqhkeyreqLab(signal); packLqhkeyreqLab(signal);
} }
} }
...@@ -7180,7 +7182,6 @@ void Dblqh::execACC_ABORTCONF(Signal* signal) ...@@ -7180,7 +7182,6 @@ void Dblqh::execACC_ABORTCONF(Signal* signal)
signal->theData[0] = regTcPtr->tupConnectrec; signal->theData[0] = regTcPtr->tupConnectrec;
EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1); EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);
regTcPtr->totSendlenAi = regTcPtr->totReclenAi;
continueAbortLab(signal); continueAbortLab(signal);
return; return;
}//Dblqh::execACC_ABORTCONF() }//Dblqh::execACC_ABORTCONF()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment