diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2005-11-23 12:32:38 +0100 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2005-11-23 12:32:38 +0100 |
| commit | 550f675ac699b231d3c12fc5eebb05e4b23f624e (patch) | |
| tree | e919ed05652774def4712f49ac546940e81ef00c /storage | |
| parent | 4f9567944c5070fe2c62cdf6004cbc74aeb011a1 (diff) | |
| download | mariadb-git-550f675ac699b231d3c12fc5eebb05e4b23f624e.tar.gz | |
corrected compile error
updated listen_event to handle _all_ events
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/common/portlib/NdbThread.c | 7 | ||||
| -rw-r--r-- | storage/ndb/test/tools/listen.cpp | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/storage/ndb/src/common/portlib/NdbThread.c b/storage/ndb/src/common/portlib/NdbThread.c index da1c385e2ea..b91e9c6a5b3 100644 --- a/storage/ndb/src/common/portlib/NdbThread.c +++ b/storage/ndb/src/common/portlib/NdbThread.c @@ -91,13 +91,15 @@ ndb_thread_wrapper(void* _ss){ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func, NDB_THREAD_ARG *p_thread_arg, - const NDB_THREAD_STACKSIZE thread_stack_size, + const NDB_THREAD_STACKSIZE _thread_stack_size, const char* p_thread_name, NDB_THREAD_PRIO thread_prio) { struct NdbThread* tmpThread; int result; pthread_attr_t thread_attr; + NDB_THREAD_STACKSIZE thread_stack_size= _thread_stack_size * SIZEOF_CHARP/4; + DBUG_ENTER("NdbThread_Create"); (void)thread_prio; /* remove warning for unused parameter */ @@ -114,9 +116,6 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func, strnmov(tmpThread->thread_name,p_thread_name,sizeof(tmpThread->thread_name)); pthread_attr_init(&thread_attr); -#if (SIZEOF_CHARP == 8) - thread_stack_size *= 2; -#endif #ifdef PTHREAD_STACK_MIN if (thread_stack_size < PTHREAD_STACK_MIN) thread_stack_size = PTHREAD_STACK_MIN; diff --git a/storage/ndb/test/tools/listen.cpp b/storage/ndb/test/tools/listen.cpp index 7327b6f71f6..cffe256bf40 100644 --- a/storage/ndb/test/tools/listen.cpp +++ b/storage/ndb/test/tools/listen.cpp @@ -163,6 +163,12 @@ main(int argc, const char** argv){ case NdbDictionary::Event::TE_UPDATE: cnt_u++; break; + case NdbDictionary::Event::TE_CLUSTER_FAILURE: + break; + case NdbDictionary::Event::TE_ALTER: + break; + case NdbDictionary::Event::TE_DROP: + break; default: /* We should REALLY never get here. */ ndbout_c("Error: unknown event type"); |