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, 9 insertions, 17 deletions

diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/ndb/src/ndbapi/NdbEventOperationImpl.cpp
index 7b4afc72ef7..6ece69cce91 100644
--- a/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+++ b/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -166,7 +166,7 @@ NdbEventOperationImpl::getValue(const NdbColumnImpl *tAttrInfo, char *aValue, in
   }
   //theErrorLine++;
 
-  tRecAttr->setUNDEFINED();
+  tRecAttr->setNULL();
   
   // We want to keep the list sorted to make data insertion easier later
   if (theFirstRecAttr == NULL) {
@@ -387,7 +387,7 @@ NdbEventOperationImpl::next(int *pOverrun)
       
       while (tAttrId > tRecAttrId) {
 	//printf("[%u] %u %u [%u]\n", tAttrId, tDataSz, *aDataPtr, tRecAttrId);
-	tWorkingRecAttr->setUNDEFINED();
+	tWorkingRecAttr->setNULL();
 	tWorkingRecAttr = tWorkingRecAttr->next();
 	if (tWorkingRecAttr == NULL)
 	  break;
@@ -399,19 +399,16 @@ NdbEventOperationImpl::next(int *pOverrun)
       //printf("[%u] %u %u [%u]\n", tAttrId, tDataSz, *aDataPtr, tRecAttrId);
       
       if (tAttrId == tRecAttrId) {
-	tWorkingRecAttr->setNotNULL();
 	if (!m_eventImpl->m_tableImpl->getColumn(tRecAttrId)->getPrimaryKey())
 	  hasSomeData++;
 	
 	//printf("set!\n");
 	
-	Uint32 *theRef = (Uint32*)tWorkingRecAttr->aRef();
-	Uint32 *theEndRef = theRef + tDataSz;
-	while (theRef < theEndRef)
-	  *theRef++ = *aDataPtr++;
+	tWorkingRecAttr->receive_data(aDataPtr, tDataSz);
 	
 	// move forward, data has already moved forward
 	aAttrPtr++;
+	aDataPtr += tDataSz;
 	tWorkingRecAttr = tWorkingRecAttr->next();
       } else {
 	// move only attr forward
@@ -423,7 +420,7 @@ NdbEventOperationImpl::next(int *pOverrun)
     while (tWorkingRecAttr != NULL) {
       tRecAttrId = tWorkingRecAttr->attrId();
       //printf("set undefined [%u] %u %u [%u]\n", tAttrId, tDataSz, *aDataPtr, tRecAttrId);
-      tWorkingRecAttr->setUNDEFINED();
+      tWorkingRecAttr->setNULL();
       tWorkingRecAttr = tWorkingRecAttr->next();
     }
     
@@ -436,7 +433,7 @@ NdbEventOperationImpl::next(int *pOverrun)
       tDataSz = AttributeHeader(*aDataPtr).getDataSize();
       aDataPtr++;
       while (tAttrId > tRecAttrId) {
-	tWorkingRecAttr->setUNDEFINED();
+	tWorkingRecAttr->setNULL();
 	tWorkingRecAttr = tWorkingRecAttr->next();
 	if (tWorkingRecAttr == NULL)
 	  break;
@@ -445,16 +442,11 @@ NdbEventOperationImpl::next(int *pOverrun)
       if (tWorkingRecAttr == NULL)
 	break;
       if (tAttrId == tRecAttrId) {
-	tWorkingRecAttr->setNotNULL();
-	
 	if (!m_eventImpl->m_tableImpl->getColumn(tRecAttrId)->getPrimaryKey())
 	  hasSomeData++;
 	
-	Uint32 *theRef = (Uint32*)tWorkingRecAttr->aRef();
-	Uint32 *theEndRef = theRef + tDataSz;
-	while (theRef < theEndRef)
-	  *theRef++ = *aDataPtr++;
-	
+	tWorkingRecAttr->receive_data(aDataPtr, tDataSz);
+	aDataPtr += tDataSz;
 	// move forward, data+attr has already moved forward
 	tWorkingRecAttr = tWorkingRecAttr->next();
       } else {
@@ -463,7 +455,7 @@ NdbEventOperationImpl::next(int *pOverrun)
       }
     }
     while (tWorkingRecAttr != NULL) {
-      tWorkingRecAttr->setUNDEFINED();
+      tWorkingRecAttr->setNULL();
       tWorkingRecAttr = tWorkingRecAttr->next();
     }