From 6049821cd0db658d96122ba4c54b39c2b3de8d35 Mon Sep 17 00:00:00 2001
From: unknown <joreland@mysql.com>
Date: Wed, 10 Nov 2004 00:39:12 +0100
Subject: wl1744 - win compile fixes

ndb/include/kernel/signaldata/RepImpl.hpp:
  more win-compile-fixes
ndb/include/mgmapi/mgmapi.h:
  more win-compile-fixes
ndb/include/ndbapi/NdbConnection.hpp:
  more win-compile-fixes
ndb/src/common/util/Properties.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/grep/Grep.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/Config.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbBlob.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbConnection.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbImpl.hpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbOperationExec.cpp:
  more win-compile-fixes
ndb/test/ndbapi/testOperations.cpp:
  more win-compile-fixes
sql/ha_ndbcluster.cc:
  more win-compile-fixes
---
 ndb/src/ndbapi/NdbBlob.cpp          | 6 +++---
 ndb/src/ndbapi/NdbConnection.cpp    | 4 ++--
 ndb/src/ndbapi/NdbImpl.hpp          | 2 +-
 ndb/src/ndbapi/NdbOperationExec.cpp | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ndb/src/ndbapi')

diff --git a/ndb/src/ndbapi/NdbBlob.cpp b/ndb/src/ndbapi/NdbBlob.cpp
index 53c0a0e07f9..da0a4f73c3e 100644
--- a/ndb/src/ndbapi/NdbBlob.cpp
+++ b/ndb/src/ndbapi/NdbBlob.cpp
@@ -975,7 +975,7 @@ NdbBlob::deletePartsUnknown(Uint32 part)
         setErrorCode(tOp);
         return -1;
       }
-      tOp->m_abortOption = IgnoreError;
+      tOp->m_abortOption = AO_IgnoreError;
       n++;
     }
     DBG("deletePartsUnknown: executeNoBlobs [in] bat=" << bat);
@@ -1223,7 +1223,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch)
         return -1;
       }
       if (isWriteOp()) {
-        tOp->m_abortOption = IgnoreError;
+        tOp->m_abortOption = AO_IgnoreError;
       }
       theHeadInlineReadOp = tOp;
       // execute immediately
@@ -1269,7 +1269,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch)
         return -1;
       }
       if (isWriteOp()) {
-        tOp->m_abortOption = IgnoreError;
+        tOp->m_abortOption = AO_IgnoreError;
       }
       theHeadInlineReadOp = tOp;
       // execute immediately
diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp
index 4f6468eb4ae..7710a3354d3 100644
--- a/ndb/src/ndbapi/NdbConnection.cpp
+++ b/ndb/src/ndbapi/NdbConnection.cpp
@@ -1578,7 +1578,7 @@ from other transactions.
                (theLastExecOpInList->theCommitIndicator == 1)){
 
 
-      if (m_abortOption == IgnoreError && theError.code != 0){
+      if (m_abortOption == AO_IgnoreError && theError.code != 0){
 	/**
 	 * There's always a TCKEYCONF when using IgnoreError
 	 */
@@ -1832,7 +1832,7 @@ NdbConnection::OpCompleteFailure(Uint8 abortOption, bool setFailure)
     //decide the success of the whole transaction since a simple
     //operation is not really part of that transaction.
     //------------------------------------------------------------------------
-    if (abortOption == IgnoreError){
+    if (abortOption == AO_IgnoreError){
       /**
        * There's always a TCKEYCONF when using IgnoreError
        */
diff --git a/ndb/src/ndbapi/NdbImpl.hpp b/ndb/src/ndbapi/NdbImpl.hpp
index 04446491cb6..baac0ee2846 100644
--- a/ndb/src/ndbapi/NdbImpl.hpp
+++ b/ndb/src/ndbapi/NdbImpl.hpp
@@ -146,7 +146,7 @@ NdbWaiter::wait(int waitTime)
       NdbCondition_Wait(m_condition, (NdbMutex*)m_mutex);
     } else {
       if (waitTime <= 0) {
-        m_state = WAIT_TIMEOUT;
+        m_state = WST_WAIT_TIMEOUT;
         break;
       }
       NdbCondition_WaitTimeout(m_condition, (NdbMutex*)m_mutex, waitTime);
diff --git a/ndb/src/ndbapi/NdbOperationExec.cpp b/ndb/src/ndbapi/NdbOperationExec.cpp
index cccc3b6409f..afa3609e11c 100644
--- a/ndb/src/ndbapi/NdbOperationExec.cpp
+++ b/ndb/src/ndbapi/NdbOperationExec.cpp
@@ -199,7 +199,7 @@ NdbOperation::prepareSend(Uint32 aTC_ConnectPtr, Uint64 aTransId)
   tcKeyReq->setKeyLength(tReqInfo, tTupKeyLen);
   
   // A simple read is always ignore error
-  abortOption = tSimpleIndicator ? IgnoreError : abortOption;
+  abortOption = tSimpleIndicator ? AO_IgnoreError : abortOption;
   tcKeyReq->setAbortOption(tReqInfo, abortOption);
   
   Uint8 tDistrKeyIndicator = theDistrKeyIndicator;
@@ -548,14 +548,14 @@ NdbOperation::receiveTCKEYREF( NdbApiSignal* aSignal)
 
   theStatus = Finished;
   // blobs want this
-  if (m_abortOption != IgnoreError)
+  if (m_abortOption != AO_IgnoreError)
     theNdbCon->theReturnStatus = NdbConnection::ReturnFailure;
 
   theError.code = aSignal->readData(4);
   theNdbCon->setOperationErrorCodeAbort(aSignal->readData(4), m_abortOption);
 
   if(theOperationType != ReadRequest || !theSimpleIndicator) // not simple read
-    return theNdbCon->OpCompleteFailure(ao, m_abortOption != IgnoreError);
+    return theNdbCon->OpCompleteFailure(ao, m_abortOption != AO_IgnoreError);
   
   /**
    * If TCKEYCONF has arrived
-- 
cgit v1.2.1