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

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1

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;
 }

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,

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();