diff options
author | joreland@mysql.com <> | 2005-05-05 10:34:39 +0200 |
---|---|---|
committer | joreland@mysql.com <> | 2005-05-05 10:34:39 +0200 |
commit | 423809286478e5919b918ebdec397336e64dbc11 (patch) | |
tree | 4cd86c7e5d699e80acd69f96a32df7ae1a53ed1b /ndb | |
parent | 0d17895910441f63eebb91878840ff2762811484 (diff) | |
download | mariadb-git-423809286478e5919b918ebdec397336e64dbc11.tar.gz |
bug#10142 - ndb unique index
post review fixes
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index c1ce1613b35..ca97a5bce6d 100644 --- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp @@ -11165,19 +11165,14 @@ void Dbtc::execTCINDXREQ(Signal* signal) regApiPtr->transid[0] = tcIndxReq->transId1; regApiPtr->transid[1] = tcIndxReq->transId2; }//if - ndbout_c("here"); if (ERROR_INSERTED(8036) || !seizeIndexOperation(regApiPtr, indexOpPtr)) { jam(); // Failed to allocate index operation - TcIndxRef * const tcIndxRef = (TcIndxRef *)signal->getDataPtrSend(); - - tcIndxRef->connectPtr = tcIndxReq->senderData; - tcIndxRef->transId[0] = regApiPtr->transid[0]; - tcIndxRef->transId[1] = regApiPtr->transid[1]; - tcIndxRef->errorCode = 288; - sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal, - TcIndxRef::SignalLength, JBB); + terrorCode = 288; + regApiPtr->m_exec_flag |= TcKeyReq::getExecuteFlag(tcIndxRequestInfo); + apiConnectptr = transPtr; + abortErrorLab(signal); return; } TcIndexOperation* indexOp = indexOpPtr.p; |