1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
joreland@mysql.com 2004-08-24 13:29:09 +02:00
commit 6f75b81b16
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/common/portlib/Makefile.am
View File

@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libportlib.la
libportlib_la_SOURCES = \ libportlib_la_SOURCES = \
NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \ NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \
NdbEnv.c NdbThread.c NdbHost.c NdbTCP.c \ NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp \
NdbDaemon.c NdbMem.c NdbDaemon.c NdbMem.c
include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/common.mk.am

5
ndb/src/common/portlib/NdbTCP.c → ndb/src/common/portlib/NdbTCP.cpp
View File

@ -16,14 +16,15 @@
#include <NdbMutex.h> #include <NdbMutex.h>
#include "NdbTCP.h" #include <NdbTCP.h>
#ifdef NDB_WIN32 #if defined NDB_WIN32 || defined SCO
static NdbMutex & LOCK_gethostbyname = * NdbMutex_Create(); static NdbMutex & LOCK_gethostbyname = * NdbMutex_Create();
#else #else
static NdbMutex LOCK_gethostbyname = NDB_MUTEX_INITIALIZER; static NdbMutex LOCK_gethostbyname = NDB_MUTEX_INITIALIZER;
#endif #endif
extern "C"
int int
Ndb_getInAddr(struct in_addr * dst, const char *address) { Ndb_getInAddr(struct in_addr * dst, const char *address) {
struct hostent * hostPtr; struct hostent * hostPtr;

2
ndb/src/ndbapi/Ndbinit.cpp
View File

@ -43,7 +43,7 @@ static int theNoOfNdbObjects = 0;
static char *ndbConnectString = 0; static char *ndbConnectString = 0;
#ifdef NDB_WIN32 #if defined NDB_WIN32 || defined SCO
static NdbMutex & createNdbMutex = * NdbMutex_Create(); static NdbMutex & createNdbMutex = * NdbMutex_Create();
#else #else
static NdbMutex createNdbMutex = NDB_MUTEX_INITIALIZER; static NdbMutex createNdbMutex = NDB_MUTEX_INITIALIZER;