merge

15bfe834 · joreland@mysql.com · a1faad1e · 42380928 · 15bfe834
Commit 15bfe834 authored May 05, 2005 by joreland@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +4 -9

No files found.
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -11372,19 +11372,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
-    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;
  }
  TcIndexOperation* indexOp = indexOpPtr.p;