Commit f2cbfb80 authored by unknown's avatar unknown
Browse files

wl1744 - ndb win-port 


ndb/include/ndbapi/NdbDictionary.hpp:
  win-port
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  win-port
ndb/include/util/SocketServer.hpp:
  win-port
ndb/src/common/portlib/win32/NdbCondition.c:
  win-port
ndb/src/common/portlib/win32/NdbEnv.c:
  win-port
ndb/src/common/portlib/win32/NdbHost.c:
  win-port
ndb/src/common/portlib/win32/NdbMem.c:
  win-port
ndb/src/common/portlib/win32/NdbMutex.c:
  win-port
ndb/src/common/portlib/win32/NdbSleep.c:
  win-port
ndb/src/common/portlib/win32/NdbTCP.c:
  win-port
ndb/src/common/portlib/win32/NdbThread.c:
  win-port
ndb/src/common/portlib/win32/NdbTick.c:
  win-port
ndb/src/common/util/File.cpp:
  win-port
ndb/src/mgmsrv/ConfigInfo.cpp:
  win-port
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  win-port
ndb/src/mgmsrv/MgmtSrvr.cpp:
  win-port
ndb/src/mgmsrv/MgmtSrvr.hpp:
  win-port
ndb/src/mgmsrv/Services.cpp:
  win-port
ndb/src/mgmsrv/Services.hpp:
  win-port
ndb/src/mgmsrv/SignalQueue.hpp:
  win-port
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  win-port
ndb/test/src/NdbRestarts.cpp:
  win-port
parent 44af4e4a

ndb/include/ndbapi/NdbDictionary.hpp

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ public: 
    /**

     * Get a specific column in the index

     */

    const NdbDictionary::Column * getColumn(unsigned no) const ;

    const Column * getColumn(unsigned no) const ;



    /**

     * Get a specific column name in the index

ndb/include/ndbapi/ndb_cluster_connection.hpp

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#define CLUSTER_CONNECTION_HPP



class TransporterFacade;

class LocalConfig;

struct LocalConfig;

class ConfigRetriever;

class NdbThread;

struct NdbThread;



extern "C" {

  void* run_ndb_cluster_connection_connect_thread(void*);

ndb/include/util/SocketServer.hpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public: 
   */

  void stopSessions(bool wait = false);

  

  void foreachSession(void (*f)(SocketServer::Session*, void*), void *data);

  void foreachSession(void (*f)(Session*, void*), void *data);



private:

  struct SessionInstance {

ndb/src/common/portlib/win32/NdbCondition.c

+1 −7
Original line number Diff line number Diff line
@@ -15,16 +15,10 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */





#include <winsock2.h>

#include <ws2tcpip.h>

#include <windows.h>

#include <assert.h>

#include <sys/types.h>



#include <ndb_global.h>

#include "NdbCondition.h"

#include <NdbMutex.h>





struct NdbCondition

{

    long nWaiters;

ndb/src/common/portlib/win32/NdbEnv.c

+1 −3
Original line number Diff line number Diff line
@@ -14,10 +14,8 @@ 
   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */





#include <ndb_global.h>

#include "NdbEnv.h"

#include <string.h>

#include <stdlib.h>



const char* NdbEnv_GetEnv(const char* name, char * buf, int buflen)

{