mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
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
This commit is contained in:
parent
7542d1f733
commit
68b8afe11b
1 changed files with 3 additions and 2 deletions
|
@ -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
|
||||||
|
@ -3846,6 +3847,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
|
||||||
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)
|
||||||
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()
|
||||||
|
|
Loading…
Reference in a new issue