diff options
| author | unknown <tomas@poseidon.bredbandsbolaget.se> | 2004-06-17 00:34:05 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.bredbandsbolaget.se> | 2004-06-17 00:34:05 +0000 |
| commit | eb48a074b8ade246f5dd08f7e3dfe379b5c31a7f (patch) | |
| tree | 46d6af8c1e1ba5606ff4a51668b0087c318c6f7d /ndb | |
| parent | 46fbf384675edd68e923c1c29a5a30c6ac1c79c0 (diff) | |
| download | mariadb-git-eb48a074b8ade246f5dd08f7e3dfe379b5c31a7f.tar.gz | |
build fixes for ndb
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/common/debugger/signaldata/BackupImpl.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/common/portlib/NdbThread.c | 2 | ||||
| -rw-r--r-- | ndb/src/ndbapi/Ndb.cpp | 4 |
3 files changed, 7 insertions, 1 deletions
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(); |