Merge

ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/Makefile_old:
  Auto merged
ndb/test/ndbapi/ScanFunctions.hpp:
  Auto merged
ndb/test/ndbapi/ScanInterpretTest.hpp:
  Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
ndb/test/ndbapi/old_dirs/testBackup/Makefile:
  Auto merged
ndb/test/ndbapi/old_dirs/testGrep/Makefile:
  Auto merged
ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testGrep.cpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/test/tools/create_index.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged

1 files changed, 8 insertions, 51 deletions

diff --git a/ndb/src/ndbapi/NdbOperation.cpp b/ndb/src/ndbapi/NdbOperation.cpp
index 8bc9111d060..74d6a462ac8 100644
--- a/ndb/src/ndbapi/NdbOperation.cpp
+++ b/ndb/src/ndbapi/NdbOperation.cpp
@@ -54,7 +54,6 @@ NdbOperation::NdbOperation(Ndb* aNdb) :
   //theTable(aTable),
   theNdbCon(NULL),
   theNext(NULL),
-  theNextScanOp(NULL),
   theTCREQ(NULL),
   theFirstATTRINFO(NULL),
   theCurrentATTRINFO(NULL),
@@ -62,8 +61,6 @@ NdbOperation::NdbOperation(Ndb* aNdb) :
   theAI_LenInCurrAI(0),
   theFirstKEYINFO(NULL),
   theLastKEYINFO(NULL),
-  theFirstRecAttr(NULL),
-  theCurrentRecAttr(NULL),
 
   theFirstLabel(NULL),
   theLastLabel(NULL),
@@ -76,10 +73,6 @@ NdbOperation::NdbOperation(Ndb* aNdb) :
   theNoOfLabels(0),
   theNoOfSubroutines(0),
 
-  theTotalRecAI_Len(0),
-  theCurrRecAI_Len(0),
-  theAI_ElementLen(0),
-  theCurrElemPtr(NULL),
   m_currentTable(NULL), //theTableId(0xFFFF),
   m_accessTable(NULL), //theAccessTableId(0xFFFF),
   //theSchemaVersion(0), 
@@ -95,17 +88,9 @@ NdbOperation::NdbOperation(Ndb* aNdb) :
   m_tcReqGSN(GSN_TCKEYREQ),
   m_keyInfoGSN(GSN_KEYINFO),
   m_attrInfoGSN(GSN_ATTRINFO),
-  theParallelism(0),
-  theScanReceiversArray(NULL),
-  theSCAN_TABREQ(NULL),
-  theFirstSCAN_TABINFO_Send(NULL),
-  theLastSCAN_TABINFO_Send(NULL),
-  theFirstSCAN_TABINFO_Recv(NULL),
-  theLastSCAN_TABINFO_Recv(NULL),
-  theSCAN_TABCONF_Recv(NULL),
   theBoundATTRINFO(NULL)
 {
-  theReceiver.init(NdbReceiver::NDB_OPERATION, this);
+  theReceiver.init(NdbReceiver::NDB_OPERATION, this, false);
   theError.code = 0;
 }
 /*****************************************************************************
@@ -165,7 +150,7 @@ NdbOperation::init(NdbTableImpl* tab, NdbConnection* myConnection){
   theNdbCon = myConnection;
   for (Uint32 i=0; i<NDB_MAX_NO_OF_ATTRIBUTES_IN_KEY; i++)
     for (int j=0; j<3; j++)
-      theTupleKeyDefined[i][j] = false;  
+      theTupleKeyDefined[i][j] = 0;
 
   theFirstATTRINFO    = NULL;
   theCurrentATTRINFO  = NULL;
@@ -175,13 +160,11 @@ NdbOperation::init(NdbTableImpl* tab, NdbConnection* myConnection){
 
   theTupKeyLen		= 0;
   theNoOfTupKeyDefined	= 0;
-  theTotalCurrAI_Len	= 0;
-  theAI_LenInCurrAI	= 0;
-  theTotalRecAI_Len	= 0;
   theDistrKeySize	= 0;
   theDistributionGroup	= 0;
-  theCurrRecAI_Len	= 0;
-  theAI_ElementLen	= 0;
+
+  theTotalCurrAI_Len	= 0;
+  theAI_LenInCurrAI	= 0;
   theStartIndicator	= 0;
   theCommitIndicator	= 0;
   theSimpleIndicator	= 0;
@@ -191,9 +174,6 @@ NdbOperation::init(NdbTableImpl* tab, NdbConnection* myConnection){
   theDistrGroupType     = 0;
   theDistrKeyIndicator  = 0;
   theScanInfo        	= 0;
-  theFirstRecAttr       = NULL;
-  theCurrentRecAttr     = NULL;
-  theCurrElemPtr        = NULL;
   theTotalNrOfKeyWordInSignal = 8;
   theMagicNumber        = 0xABCDEF01;
   theBoundATTRINFO      = NULL;
@@ -212,6 +192,7 @@ NdbOperation::init(NdbTableImpl* tab, NdbConnection* myConnection){
   tcKeyReq->scanInfo = 0;
   theKEYINFOptr = &tcKeyReq->keyInfo[0];
   theATTRINFOptr = &tcKeyReq->attrInfo[0];
+  theReceiver.init(NdbReceiver::NDB_OPERATION, this, false);
   return 0;
 }
 
@@ -226,8 +207,6 @@ NdbOperation::release()
 {
   NdbApiSignal* tSignal;
   NdbApiSignal* tSaveSignal;
-  NdbRecAttr*	tRecAttr;
-  NdbRecAttr*	tSaveRecAttr;
   NdbBranch*	tBranch;
   NdbBranch*	tSaveBranch;
   NdbLabel*	tLabel;
@@ -260,15 +239,6 @@ NdbOperation::release()
   }				
   theFirstKEYINFO = NULL;
   theLastKEYINFO = NULL;
-  tRecAttr = theFirstRecAttr;
-  while (tRecAttr != NULL)
-  {
-    tSaveRecAttr = tRecAttr;
-    tRecAttr = tRecAttr->next();
-    theNdb->releaseRecAttr(tSaveRecAttr);
-  }
-  theFirstRecAttr = NULL;
-  theCurrentRecAttr = NULL;
   if (theInterpretIndicator == 1)
   {
     tBranch = theFirstBranch;
@@ -308,19 +278,18 @@ NdbOperation::release()
     }
     theBoundATTRINFO = NULL;
   }
-  releaseScan();
 }
 
 NdbRecAttr*
 NdbOperation::getValue(const char* anAttrName, char* aValue)
 {
-  return getValue(m_currentTable->getColumn(anAttrName), aValue);
+  return getValue_impl(m_currentTable->getColumn(anAttrName), aValue);
 }
 
 NdbRecAttr*
 NdbOperation::getValue(Uint32 anAttrId, char* aValue)
 {
-  return getValue(m_currentTable->getColumn(anAttrId), aValue);
+  return getValue_impl(m_currentTable->getColumn(anAttrId), aValue);
 }
 
 int
@@ -416,16 +385,4 @@ NdbOperation::write_attr(Uint32 anAttrId, Uint32 RegDest)
   return write_attr(m_currentTable->getColumn(anAttrId), RegDest);
 }
 
-int
-NdbOperation::setBound(const char* anAttrName, int type, const void* aValue, Uint32 len)
-{
-  return setBound(m_accessTable->getColumn(anAttrName), type, aValue, len);
-}
-
-int
-NdbOperation::setBound(Uint32 anAttrId, int type, const void* aValue, Uint32 len)
-{
-  return setBound(m_accessTable->getColumn(anAttrId), type, aValue, len);
-}
-