From c2ec05d1b5fa53aebf79d4fef74ddd091032e73f Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Wed, 17 Nov 2004 10:07:52 +0100
Subject: wl#2126 - read_multi_range ndb part

ndb/include/ndbapi/NdbConnection.hpp:
  Utility methods
ndb/include/ndbapi/NdbOperation.hpp:
  Utility methods
ndb/src/ndbapi/NdbConnection.cpp:
  Don't set theReturnStatus all_the_time, but let it be decided on
  a operation bases
ndb/src/ndbapi/NdbOperationExec.cpp:
  AbortOption
sql/ha_ndbcluster.cc:
  1) removed execute from define_read_attr
  2) let a bunch of methods use define_read_attr
  3) impl. read_multi_range
sql/ha_ndbcluster.h:
  read_multi_range
---
 ndb/src/ndbapi/NdbConnection.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'ndb/src/ndbapi/NdbConnection.cpp')

diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp
index 8cf7c46deee..ed437e5e072 100644
--- a/ndb/src/ndbapi/NdbConnection.cpp
+++ b/ndb/src/ndbapi/NdbConnection.cpp
@@ -232,21 +232,6 @@ Remark:        Handle time-out on a transaction object.
 void
 NdbConnection::handleExecuteCompletion()
 {
-  
-  if (theCompletionStatus == CompletedFailure) {
-    NdbOperation* tOpTemp = theFirstExecOpInList;
-    while (tOpTemp != NULL) {
-/*****************************************************************************
- *	Ensure that all executing operations report failed for each 
- *      read attribute when failure occurs. 
- *      We do not want any operations to report both failure and 
- *      success on different read attributes.
- ****************************************************************************/
-      tOpTemp->handleFailedAI_ElemLen();
-      tOpTemp = tOpTemp->next();
-    }//while
-    theReturnStatus = ReturnFailure;
-  }//if
   /***************************************************************************
    *	  Move the NdbOperation objects from the list of executing 
    *      operations to list of completed
@@ -1512,6 +1497,7 @@ transactions.
     /**********************************************************************/
     theCompletionStatus = CompletedFailure;
     theCommitStatus = Aborted;
+    theReturnStatus = ReturnFailure;
     return 0;
   } else {
 #ifdef NDB_NO_DROPPED_SIGNAL
-- 
cgit v1.2.1