Commit 6049821c authored by unknown's avatar unknown
Browse files

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
parent 59ee75bd

ndb/include/kernel/signaldata/RepImpl.hpp

+6 −6
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public: 
  Uint32 subscriptionId;

  Uint32 subscriptionKey;

  Uint32 senderNodeId;

  GrepError::Code err;

  GrepError::GE_Code err;

};



class RepGetGciReq
@@ -151,7 +151,7 @@ public: 
  Uint32 lastPSGCI;

  Uint32 firstSSGCI;

  Uint32 lastSSGCI;

  GrepError::Code err;

  GrepError::GE_Code err;

};



class RepGetGciBufferReq {
@@ -213,7 +213,7 @@ public: 
  Uint32 lastSSGCI;

  Uint32 currentGCIBuffer;

  Uint32 nodeGrp;

  GrepError::Code err;

  GrepError::GE_Code err;

};



class RepInsertGciBufferReq
@@ -252,7 +252,7 @@ public: 
  Uint32 nodeGrp;

  Uint32 tableId;

  Uint32 force;

  GrepError::Code err;

  GrepError::GE_Code err;

};



class RepInsertGciBufferConf
@@ -310,7 +310,7 @@ public: 
  Uint32 lastGCI;

  Uint32 currentGCI;

  Uint32 nodeGrp;

  GrepError::Code err;

  GrepError::GE_Code err;

};



class RepClearPSGciBufferConf
@@ -367,7 +367,7 @@ public: 
  Uint32 lastGCI;

  Uint32 currentGCI;

  Uint32 nodeGrp;

  GrepError::Code err;

  GrepError::GE_Code err;

};



class RepClearSSGciBufferConf

ndb/include/mgmapi/mgmapi.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
 *  @{

 */



#include <ndb_types.h>

#include "mgmapi_config_parameters.h"



#ifdef __cplusplus

ndb/include/ndbapi/NdbConnection.hpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ enum AbortOption { 
  TryCommit = 0,                ///< <i>Missing explanation</i>

#endif

  AbortOnError = 0,             ///< Abort transaction on failed operation

  IgnoreError = 2               ///< Transaction continues on failed operation

  AO_IgnoreError = 2               ///< Transaction continues on failed operation

};

  

typedef AbortOption CommitType;

ndb/src/common/util/Properties.cpp

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ PropertiesImpl::unpack(const Uint32 * buf, Uint32 &bufLen, Properties * top, 
    case PropertiesType_Properties:

      assert(0);

    }

    if(res3 != true){

    if(!res3){

      return false;

    }

    _items--;

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+3 −3
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ Dbdict::writeTableFile(Signal* signal, Uint32 tableId, 
  Uint32 sz = tabInfoPtr.sz + ZPAGE_HEADER_SIZE;



  c_writeTableRecord.noOfPages = DIV(sz, ZSIZE_OF_PAGES_IN_WORDS);

  c_writeTableRecord.tableWriteState = WriteTableRecord::CALLBACK;

  c_writeTableRecord.tableWriteState = WriteTableRecord::TWR_CALLBACK;

  c_writeTableRecord.m_callback = * callback;



  c_writeTableRecord.pageId = 0;
@@ -647,7 +647,7 @@ void Dbdict::closeWriteTableConf(Signal* signal, 
  case WriteTableRecord::WRITE_RESTART_FROM_OWN :

    ndbrequire(false);

    break;

  case WriteTableRecord::CALLBACK:

  case WriteTableRecord::TWR_CALLBACK:

    jam();

    execute(signal, c_writeTableRecord.m_callback, 0);

    return;
@@ -2381,7 +2381,7 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal, 
  ndbrequire(c_writeTableRecord.tableWriteState == WriteTableRecord::IDLE);

  c_writeTableRecord.noOfPages = c_readTableRecord.noOfPages;

  c_writeTableRecord.pageId = c_readTableRecord.pageId;

  c_writeTableRecord.tableWriteState = WriteTableRecord::CALLBACK;

  c_writeTableRecord.tableWriteState = WriteTableRecord::TWR_CALLBACK;

  c_writeTableRecord.m_callback.m_callbackData = callbackData;

  c_writeTableRecord.m_callback.m_callbackFunction = 

    safe_cast(&Dbdict::restartCreateTab_writeTableConf);