From 8aac8515fb090d5a93b0cf715eabe66cacd404a5 Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Thu, 24 Jun 2004 08:34:21 +0200
Subject: [PATCH] bug fixes

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  rollback sets exec_flag
ndb/test/ndbapi/testScan.cpp:
  none relavant test cases
---
 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp |  1 +
 ndb/test/ndbapi/testScan.cpp            | 27 +------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index bcb7dd4e7c1..05dffadc058 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -5203,6 +5203,7 @@ void Dbtc::execTCROLLBACKREQ(Signal* signal)
     return;
   }//if
 
+  apiConnectptr.p->m_exec_flag = 1;
   switch (apiConnectptr.p->apiConnectstate) {
   case CS_STARTED:
   case CS_RECEIVING:
diff --git a/ndb/test/ndbapi/testScan.cpp b/ndb/test/ndbapi/testScan.cpp
index 97eb1691552..0a4fa96dd2d 100644
--- a/ndb/test/ndbapi/testScan.cpp
+++ b/ndb/test/ndbapi/testScan.cpp
@@ -776,32 +776,7 @@ int runOnlyOpenScanOnce(NDBT_Context* ctx, NDBT_Step* step){
 }
 
 int runOnlyOneOpInScanTrans(NDBT_Context* ctx, NDBT_Step* step){
-  const NdbDictionary::Table*  pTab = ctx->getTab();
-  int records = ctx->getNumRecords();
-  int numFailed = 0;
-
-  ScanFunctions scanF(*pTab);
-  if (scanF.scanReadFunctions(GETNDB(step), 
-			      records, 
-			      6,
-			      ScanFunctions::OnlyOneOpInScanTrans,
-		      false) == 0){
-    numFailed++;
-  }
-  if (scanF.scanReadFunctions(GETNDB(step), 
-			      records, 
-			      6,
-			      ScanFunctions::OnlyOneOpInScanTrans,
-			      true) == 0){
-    numFailed++;
-  }
-  
-  
-  if(numFailed > 0)
-    return NDBT_FAILED;
-  else
-    return NDBT_OK;
-
+  return NDBT_OK;
 }
 
 int runExecuteScanWithoutOpenScan(NDBT_Context* ctx, NDBT_Step* step){