From: Date: May 5 2005 10:34am
Subject: bk commit into 4.1 tree (joreland:1.2227) BUG#10142
List-Archive: http://lists.mysql.com/internals/24570
X-Bug: 10142
Message-Id: <20050505083444.4D583FAB9E@eel>

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2227 05/05/05 10:34:39 joreland@stripped +1 -0
  bug#10142 - ndb unique index
    post review fixes

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.55 05/05/05 10:34:37 joreland@stripped +4 -9
    remove printout
    abort transaction instead of operation.
      concider m_exec_flag

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joreland
# Host:	eel.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.54/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	Tue May  3 12:16:28 2005
+++ 1.55/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	Thu May  5 10:34:37 2005
@@ -11165,19 +11165,14 @@
     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;