From 00e5047e98c078d7f7e7e84d999d114dd4a6ead5 Mon Sep 17 00:00:00 2001
From: "joreland@mysql.com" <>
Date: Fri, 15 Oct 2004 08:08:39 +0200
Subject: [PATCH] autotest failures

---
 ndb/src/kernel/blocks/dblqh/Dblqh.hpp     |  1 +
 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 20 ++++++++++++++------
 ndb/src/ndbapi/NdbOperationExec.cpp       | 21 ++++++++++++++++-----
 ndb/src/ndbapi/NdbScanOperation.cpp       |  2 ++
 ndb/test/src/UtilTransactions.cpp         |  9 ++++++++-
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index 4476180cb11..d6987f3e478 100644
--- a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
@@ -2433,6 +2433,7 @@ private:
   void abortStateHandlerLab(Signal* signal);
   void writeAttrinfoLab(Signal* signal);
   void scanAttrinfoLab(Signal* signal, Uint32* dataPtr, Uint32 length);
+  void abort_scan(Signal* signal, Uint32 scan_ptr_i, Uint32 errcode);
   void localAbortStateHandlerLab(Signal* signal);
   void logLqhkeyreqLab(Signal* signal);
   void lqhAttrinfoLab(Signal* signal, Uint32* dataPtr, Uint32 length);
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index d42e199fc63..e6a689eb8d7 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -2824,9 +2824,11 @@ void Dblqh::execKEYINFO(Signal* signal)
       return;
     }//if
     jam();
-    abort();
     terrorCode = errorCode;
-    abortErrorLab(signal);
+    if(state == TcConnectionrec::WAIT_TUPKEYINFO)
+      abortErrorLab(signal);
+    else
+      abort_scan(signal, regTcPtr->tcScanRec, errorCode);
     return;
   }//if
   if(state == TcConnectionrec::WAIT_TUPKEYINFO)
@@ -7602,23 +7604,29 @@ void Dblqh::scanAttrinfoLab(Signal* signal, Uint32* dataPtr, Uint32 length)
     }//if
     return;
   }//if
-  terrorCode = ZGET_ATTRINBUF_ERROR;
+  abort_scan(signal, scanptr.i, ZGET_ATTRINBUF_ERROR);
+}
+
+void Dblqh::abort_scan(Signal* signal, Uint32 scan_ptr_i, Uint32 errcode){
+  jam();
+  scanptr.i = scan_ptr_i;
+  c_scanRecordPool.getPtr(scanptr);
   finishScanrec(signal);
   releaseScanrec(signal);
   tcConnectptr.p->transactionState = TcConnectionrec::IDLE;
   tcConnectptr.p->abortState = TcConnectionrec::ABORT_ACTIVE;
-
+  
   ScanFragRef * ref = (ScanFragRef*)&signal->theData[0];
   ref->senderData = tcConnectptr.p->clientConnectrec;
   ref->transId1 = tcConnectptr.p->transid[0];
   ref->transId2 = tcConnectptr.p->transid[1];
-  ref->errorCode = terrorCode;
+  ref->errorCode = errcode;
   sendSignal(tcConnectptr.p->clientBlockref, GSN_SCAN_FRAGREF, signal, 
 	     ScanFragRef::SignalLength, JBB);
   deleteTransidHash(signal);
   releaseOprec(signal);
   releaseTcrec(signal, tcConnectptr);
-}//Dblqh::scanAttrinfoLab()
+}
 
 /*---------------------------------------------------------------------*/
 /* Send this 'I am alive' signal to TC when it is received from ACC    */
diff --git a/ndb/src/ndbapi/NdbOperationExec.cpp b/ndb/src/ndbapi/NdbOperationExec.cpp
index da4eaf49613..f1338ae01e4 100644
--- a/ndb/src/ndbapi/NdbOperationExec.cpp
+++ b/ndb/src/ndbapi/NdbOperationExec.cpp
@@ -541,6 +541,9 @@ NdbOperation::receiveTCKEYREF( NdbApiSignal* aSignal)
     return -1;
   }//if
 
+  AbortOption ao = (AbortOption)theNdbCon->m_abortOption;
+  theReceiver.m_received_result_length = ~0;
+
   theStatus = Finished;
   theNdbCon->theReturnStatus = NdbConnection::ReturnFailure;
 
@@ -548,11 +551,19 @@ NdbOperation::receiveTCKEYREF( NdbApiSignal* aSignal)
   theNdbCon->setOperationErrorCodeAbort(aSignal->readData(4));
 
   if(theOperationType != ReadRequest || !theSimpleIndicator) // not simple read
-    return theNdbCon->OpCompleteFailure(theNdbCon->m_abortOption);
-
-  // Simple read is always ignore error
-  return theNdbCon->OpCompleteFailure(IgnoreError);
-}//NdbOperation::receiveTCKEYREF()
+    return theNdbCon->OpCompleteFailure(ao);
+  
+  /**
+   * If TCKEYCONF has arrived
+   *   op has completed (maybe trans has completed)
+   */
+  if(theReceiver.m_expected_result_length)
+  {
+    return theNdbCon->OpCompleteFailure(AbortOnError);
+  }
+  
+  return -1;
+}
 
 
 void
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp
index c3f6e3edbbc..b23bc8cfe4d 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -566,6 +566,8 @@ int NdbScanOperation::nextResult(bool fetchAllowed)
     setErrorCode(4028); // Node fail
     break;
   case -3: // send_next_scan -> return fail (set error-code self)
+    if(theError.code == 0)
+      setErrorCode(4028); // seq changed = Node fail
     break;
   }
     
diff --git a/ndb/test/src/UtilTransactions.cpp b/ndb/test/src/UtilTransactions.cpp
index 68fd5d3662d..c0e6effd244 100644
--- a/ndb/test/src/UtilTransactions.cpp
+++ b/ndb/test/src/UtilTransactions.cpp
@@ -951,8 +951,15 @@ UtilTransactions::scanAndCompareUniqueIndex(Ndb* pNdb,
 
     pOp = pTrans->getNdbScanOperation(tab.getName());	
     if (pOp == NULL) {
-      ERR(pTrans->getNdbError());
+      const NdbError err = pNdb->getNdbError();
       pNdb->closeTransaction(pTrans);
+      ERR(err);
+      
+      if (err.status == NdbError::TemporaryError){
+	NdbSleep_MilliSleep(50);
+	retryAttempt++;
+	continue;
+      }
       return NDBT_FAILED;
     }