mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
merge
This commit is contained in:
commit
15bfe83479
1 changed files with 4 additions and 9 deletions
|
@ -11372,19 +11372,14 @@ void Dbtc::execTCINDXREQ(Signal* signal)
|
||||||
regApiPtr->transid[0] = tcIndxReq->transId1;
|
regApiPtr->transid[0] = tcIndxReq->transId1;
|
||||||
regApiPtr->transid[1] = tcIndxReq->transId2;
|
regApiPtr->transid[1] = tcIndxReq->transId2;
|
||||||
}//if
|
}//if
|
||||||
ndbout_c("here");
|
|
||||||
|
|
||||||
if (ERROR_INSERTED(8036) || !seizeIndexOperation(regApiPtr, indexOpPtr)) {
|
if (ERROR_INSERTED(8036) || !seizeIndexOperation(regApiPtr, indexOpPtr)) {
|
||||||
jam();
|
jam();
|
||||||
// Failed to allocate index operation
|
// Failed to allocate index operation
|
||||||
TcKeyRef * const tcIndxRef = (TcKeyRef *)signal->getDataPtrSend();
|
terrorCode = 288;
|
||||||
|
regApiPtr->m_exec_flag |= TcKeyReq::getExecuteFlag(tcIndxRequestInfo);
|
||||||
tcIndxRef->connectPtr = tcIndxReq->senderData;
|
apiConnectptr = transPtr;
|
||||||
tcIndxRef->transId[0] = regApiPtr->transid[0];
|
abortErrorLab(signal);
|
||||||
tcIndxRef->transId[1] = regApiPtr->transid[1];
|
|
||||||
tcIndxRef->errorCode = 288;
|
|
||||||
sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal,
|
|
||||||
TcKeyRef::SignalLength, JBB);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
TcIndexOperation* indexOp = indexOpPtr.p;
|
TcIndexOperation* indexOp = indexOpPtr.p;
|
||||||
|
|
Loading…
Reference in a new issue