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

into mysql.com:/home/jonas/src/mysql-4.1

ndb/src/common/portlib/Makefile.am

@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libportlib.la
 
 libportlib_la_SOURCES = \
 	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
 
 include $(top_srcdir)/ndb/config/common.mk.am

ndb/src/common/portlib/NdbTCP.c → ndb/src/common/portlib/NdbTCP.cpp

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

ndb/src/ndbapi/Ndbinit.cpp

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