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

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

Browse Source 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
This commit is contained in:
tomas@poseidon.bredbandsbolaget.se 2004-06-17 00:34:50 +00:00
commit 671a4344c0
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/common/debugger/signaldata/BackupImpl.cpp
View File

@ -24,7 +24,7 @@ printDEFINE_BACKUP_REQ(FILE * out, const Uint32 * data, Uint32 len, Uint16 bno){
sig->backupPtr, sig->backupId, sig->clientRef, sig->clientData); sig->backupPtr, sig->backupId, sig->clientRef, sig->clientData);
fprintf(out, " backupKey: [ %08x%08x ] DataLength: %d\n", fprintf(out, " backupKey: [ %08x%08x ] DataLength: %d\n",
sig->backupKey[0], sig->backupKey[1], sig->backupDataLen); 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)); fprintf(out, " Nodes: %s\n", sig->nodes.getText(buf));
return true; return true;
} }

2
ndb/src/common/portlib/NdbThread.c
View File

@ -58,7 +58,9 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
pthread_attr_setguardsize(&thread_attr, 2048); pthread_attr_setguardsize(&thread_attr, 2048);
#endif #endif
#ifdef PTHREAD_CREATE_JOINABLE /* needed on SCO */
pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_JOINABLE); pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_JOINABLE);
#endif
result = pthread_create(&tmpThread->thread, result = pthread_create(&tmpThread->thread,
&thread_attr, &thread_attr,
p_thread_func, p_thread_func,

4
ndb/src/ndbapi/Ndb.cpp
View File

@ -38,6 +38,10 @@ Name: Ndb.cpp
#include <NdbEnv.h> #include <NdbEnv.h>
#include <BaseString.hpp> #include <BaseString.hpp>
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/**************************************************************************** /****************************************************************************
void connect(); void connect();