bk commit into 5.1 tree (knielsen:1.2596) BUG#35923

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen.  When knielsen 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@stripped, 2008-04-09 08:17:54+02:00, knielsen@ymer.(none) +1 -0
  Bug #35923: cross-thread EXECUTE_DIRECT in multi-threaded ndbd
  
  Indentation/whitespace only changes committed separately from real patch.

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2008-04-09 08:17:50+02:00, knielsen@ymer.(none) +18 -18
    Bug #35923: cross-thread EXECUTE_DIRECT in multi-threaded ndbd
    
    Indentation/whitespace only changes committed separately from real patch.

diff -Nrup a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-04-09 08:15:33 +02:00
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-04-09 08:17:50 +02:00
@@ -12606,24 +12606,24 @@ void Dbtc::execTRANSID_AI(Signal* signal
   }
   else
   {
-  if (!saveTRANSID_AI(signal,
-		      indexOp, 
-                      transIdAI->getData(), 
-                      signal->getLength() - TransIdAI::HeaderLength)) {
-  save_error:
-    jam();
-    // Failed to allocate space for TransIdAI
-    TcKeyRef * const tcIndxRef = (TcKeyRef *)signal->getDataPtrSend();
-    
-    tcIndxRef->connectPtr = indexOp->tcIndxReq.senderData;
-    tcIndxRef->transId[0] = regApiPtr->transid[0];
-    tcIndxRef->transId[1] = regApiPtr->transid[1];
-    tcIndxRef->errorCode = 4000;
-    tcIndxRef->errorData = 0;
-    sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal, 
-	       TcKeyRef::SignalLength, JBB);
-    return;
-  }
+    if (!saveTRANSID_AI(signal,
+                        indexOp,
+                        transIdAI->getData(),
+                        signal->getLength() - TransIdAI::HeaderLength)) {
+    save_error:
+      jam();
+      // Failed to allocate space for TransIdAI
+      TcKeyRef * const tcIndxRef = (TcKeyRef *)signal->getDataPtrSend();
+
+      tcIndxRef->connectPtr = indexOp->tcIndxReq.senderData;
+      tcIndxRef->transId[0] = regApiPtr->transid[0];
+      tcIndxRef->transId[1] = regApiPtr->transid[1];
+      tcIndxRef->errorCode = 4000;
+      tcIndxRef->errorData = 0;
+      sendSignal(regApiPtr->ndbapiBlockref, GSN_TCINDXREF, signal,
+                 TcKeyRef::SignalLength, JBB);
+      return;
+    }
   }
 
   switch(indexOp->indexOpState) {