Fix AttrType moves

ndb/src/ndbapi/Makefile.am

@@ -22,8 +22,7 @@ libndbapi_la_SOURCES_loc = \
         NdbOperationDefine.cpp  \
         NdbOperationExec.cpp    \
         NdbResultSet.cpp        \
-        NdbCursorOperation.cpp  \
-        NdbScanReceiver.cpp NdbScanOperation.cpp    NdbScanFilter.cpp \
+        NdbScanOperation.cpp    NdbScanFilter.cpp \
         NdbIndexOperation.cpp   \
         NdbEventOperation.cpp   \
         NdbEventOperationImpl.cpp   \

ndb/src/ndbapi/NdbConnection.cpp

@@ -1359,16 +1359,16 @@ NdbConnection::receiveTCKEY_FAILCONF(const TcKeyFailConf * failConf)
        * in committing the transaction.
        */
       switch(tOp->theOperationType){
-      case UpdateRequest:
-      case InsertRequest:
-      case DeleteRequest:
-      case WriteRequest:
+      case NdbOperation::UpdateRequest:
+      case NdbOperation::InsertRequest:
+      case NdbOperation::DeleteRequest:
+      case NdbOperation::WriteRequest:
 	tOp = tOp->next();
 	break;
-      case ReadRequest:
-      case ReadExclusive:
-      case OpenScanRequest:
-      case OpenRangeScanRequest:
+      case NdbOperation::ReadRequest:
+      case NdbOperation::ReadExclusive:
+      case NdbOperation::OpenScanRequest:
+      case NdbOperation::OpenRangeScanRequest:
 	theCompletionStatus = CompletedFailure;
 	setOperationErrorCodeAbort(4115);
 	tOp = NULL;
@@ -1403,18 +1403,18 @@ NdbConnection::receiveTCKEY_FAILREF(NdbApiSignal* aSignal)
       We received an indication of that this transaction was aborted due to a
       node failure.
     */
-    if (theSendStatus == sendTC_ROLLBACK) {
+    if (theSendStatus == NdbConnection::sendTC_ROLLBACK) {
       /*
 	We were in the process of sending a rollback anyways. We will
 	report it as a success.
       */
-      theCompletionStatus = CompletedSuccess;
+      theCompletionStatus = NdbConnection::CompletedSuccess;
     } else {
-      theCompletionStatus = CompletedFailure;
+      theCompletionStatus = NdbConnection::CompletedFailure;
       theError.code = 4031;
     }//if
     theReleaseOnClose = true;
-    theCommitStatus = Aborted;
+    theCommitStatus = NdbConnection::Aborted;
     return 0;
   }
   return -1;
@@ -1463,8 +1463,8 @@ NdbConnection::receiveTCINDXCONF(const TcIndxConf * indxConf,
       // no Commit flag set. This is clearly an anomaly.
       /**********************************************************************/
       theError.code = 4011;
-      theCompletionStatus = CompletedFailure;
-      theCommitStatus = Aborted;
+      theCompletionStatus = NdbConnection::CompletedFailure;
+      theCommitStatus = NdbConnection::Aborted;
       return 0;
     }//if
     if (tNoComp >= tNoSent) {
@@ -1497,8 +1497,8 @@ NdbConnection::receiveTCINDXREF( NdbApiSignal* aSignal)
     /*	and we only need to report completion and return with the     */
     /*	error code to the application.				      */
     /**********************************************************************/
-    theCompletionStatus = CompletedFailure;
-    theCommitStatus = Aborted;
+    theCompletionStatus = NdbConnection::CompletedFailure;
+    theCommitStatus = NdbConnection::Aborted;
     return 0;
   }
   return -1;
@@ -1517,7 +1517,7 @@ NdbConnection::OpCompleteFailure()
 {
   Uint32 tNoComp = theNoOfOpCompleted;
   Uint32 tNoSent = theNoOfOpSent;
-  theCompletionStatus = CompletedFailure;
+  theCompletionStatus = NdbConnection::CompletedFailure;
   tNoComp++;
   theNoOfOpCompleted = tNoComp;
   if (tNoComp == tNoSent) {
@@ -1528,7 +1528,7 @@ NdbConnection::OpCompleteFailure()
     //operation is not really part of that transaction.
     //------------------------------------------------------------------------
     if (theSimpleState == 1) {
-      theCommitStatus = Aborted;
+      theCommitStatus = NdbConnection::Aborted;
     }//if
     return 0;	// Last operation received
   } else if (tNoComp > tNoSent) {
@@ -1556,7 +1556,7 @@ NdbConnection::OpCompleteSuccess()
   theNoOfOpCompleted = tNoComp;
   if (tNoComp == tNoSent) { // Last operation completed
     if (theSimpleState == 1) {
-      theCommitStatus = Committed;
+      theCommitStatus = NdbConnection::Committed;
     }//if
     return 0;
   } else if (tNoComp < tNoSent) {
@@ -1564,7 +1564,7 @@ NdbConnection::OpCompleteSuccess()
   } else {
     setOperationErrorCodeAbort(4113);	// Too many operations, 
                                         // stop waiting for more
-    theCompletionStatus = CompletedFailure;
+    theCompletionStatus = NdbConnection::CompletedFailure;
     return 0;
   }//if
 }//NdbConnection::OpCompleteSuccess()
@@ -1577,7 +1577,7 @@ Remark:		Get global checkpoint identity of the transaction
 int
 NdbConnection::getGCI()
 {
-  if (theCommitStatus == Committed) {
+  if (theCommitStatus == NdbConnection::Committed) {
     return theGlobalCheckpointId;
   }//if
   return 0;

ndb/src/ndbapi/NdbScanOperation.cpp

@@ -439,7 +439,7 @@ NdbScanOperation::executeCursor(int nodeId){
       TRACE_DEBUG("The node is stopping when attempting to start a scan");
       setErrorCode(4030);
     }//if
-    tCon->theCommitStatus = Aborted;
+    tCon->theCommitStatus = NdbConnection::Aborted;
   }//if
   return -1;
 }
@@ -709,8 +709,8 @@ NdbScanOperation::execCLOSE_SCAN_REP(Uint32 errCode){
     /**
      * Normal termination
      */
-    theNdbCon->theCommitStatus = Committed;
-    theNdbCon->theCompletionStatus = CompletedSuccess;
+    theNdbCon->theCommitStatus = NdbConnection::Committed;
+    theNdbCon->theCompletionStatus = NdbConnection::CompletedSuccess;
   } else {
     /**
      * Something is fishy
@@ -1111,7 +1111,7 @@ NdbIndexScanOperation::fix_get_values(){
   NdbRecAttr * curr = theReceiver.theFirstRecAttr;
   
   Uint32 cnt = m_sort_columns;
-  assert(cnt < MAXNROFTUPLEKEY);
+  assert(cnt <  NDB_MAX_NO_OF_ATTRIBUTES_IN_KEY);
 
   Uint32 idx = 0;
   NdbTableImpl * tab = m_currentTable;