Commit f7420730 authored by joreland@mysql.com's avatar joreland@mysql.com

Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 97a778d8 9644e342
...@@ -39,14 +39,14 @@ struct NdbThread ...@@ -39,14 +39,14 @@ struct NdbThread
static static
void* void*
ndb_thread_wrapper(void* _ss){ ndb_thread_wrapper(void* _ss){
DBUG_ENTER("ndb_thread_wrapper");
void * ret; void * ret;
struct NdbThread * ss = (struct NdbThread *)_ss; struct NdbThread * ss = (struct NdbThread *)_ss;
DBUG_ENTER("ndb_thread_wrapper");
#ifdef NDB_SHM_TRANSPORTER #ifdef NDB_SHM_TRANSPORTER
if (g_ndb_shm_signum) if (g_ndb_shm_signum)
{ {
DBUG_PRINT("info",("Block signum %d",g_ndb_shm_signum));
sigset_t mask; sigset_t mask;
DBUG_PRINT("info",("Block signum %d",g_ndb_shm_signum));
sigemptyset(&mask); sigemptyset(&mask);
sigaddset(&mask, g_ndb_shm_signum); sigaddset(&mask, g_ndb_shm_signum);
pthread_sigmask(SIG_BLOCK, &mask, 0); pthread_sigmask(SIG_BLOCK, &mask, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment