From 23209c023c164823db5d2b8482ce0b221c13de3e Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.bredbandsbolaget.se" <>
Date: Thu, 17 Jun 2004 00:34:05 +0000
Subject: [PATCH] build fixes for ndb

---
 ndb/src/common/debugger/signaldata/BackupImpl.cpp | 2 +-
 ndb/src/common/portlib/NdbThread.c                | 2 ++
 ndb/src/ndbapi/Ndb.cpp                            | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ndb/src/common/debugger/signaldata/BackupImpl.cpp b/ndb/src/common/debugger/signaldata/BackupImpl.cpp
index be9e43e3df1..bdc34d614cf 100644
--- a/ndb/src/common/debugger/signaldata/BackupImpl.cpp
+++ b/ndb/src/common/debugger/signaldata/BackupImpl.cpp
@@ -24,7 +24,7 @@ printDEFINE_BACKUP_REQ(FILE * out, const Uint32 * data, Uint32 len, Uint16 bno){
 	  sig->backupPtr, sig->backupId, sig->clientRef, sig->clientData);
   fprintf(out, " backupKey: [ %08x%08x ] DataLength: %d\n",
 	  sig->backupKey[0], sig->backupKey[1], sig->backupDataLen);
-  char buf[sig->nodes.TextLength + 1];
+  char buf[_NDB_NODE_BITMASK_SIZE * 8 + 1];
   fprintf(out, " Nodes: %s\n", sig->nodes.getText(buf));
   return true;
 }
diff --git a/ndb/src/common/portlib/NdbThread.c b/ndb/src/common/portlib/NdbThread.c
index b023e851d29..8683a37edcb 100644
--- a/ndb/src/common/portlib/NdbThread.c
+++ b/ndb/src/common/portlib/NdbThread.c
@@ -58,7 +58,9 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
   pthread_attr_setguardsize(&thread_attr, 2048);
 #endif
 
+#ifdef PTHREAD_CREATE_JOINABLE /* needed on SCO */
   pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_JOINABLE);
+#endif
   result = pthread_create(&tmpThread->thread, 
 			  &thread_attr,
   		          p_thread_func,
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index f55c37709b6..3be78bbf2f8 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -38,6 +38,10 @@ Name:          Ndb.cpp
 #include <NdbEnv.h>
 #include <BaseString.hpp>
 
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
 /****************************************************************************
 void connect();