Fix a crash of SHOW PROCESSLIST
sql/event_scheduler.cc: Fix a crash when calling show processlist and an event thread is starting. Don't add the thread to threads before it is fully initialized.
This commit is contained in:
parent
e69e640f2e
commit
3391899858
@ -123,6 +123,12 @@ post_init_event_thread(THD *thd)
|
|||||||
VOID(sigemptyset(&set)); // Get mask in use
|
VOID(sigemptyset(&set)); // Get mask in use
|
||||||
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
|
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
|
||||||
#endif
|
#endif
|
||||||
|
pthread_mutex_lock(&LOCK_thread_count);
|
||||||
|
threads.append(thd);
|
||||||
|
thread_count++;
|
||||||
|
thread_running++;
|
||||||
|
pthread_mutex_unlock(&LOCK_thread_count);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -182,9 +188,6 @@ pre_init_event_thread(THD* thd)
|
|||||||
thd->client_capabilities|= CLIENT_MULTI_RESULTS;
|
thd->client_capabilities|= CLIENT_MULTI_RESULTS;
|
||||||
pthread_mutex_lock(&LOCK_thread_count);
|
pthread_mutex_lock(&LOCK_thread_count);
|
||||||
thd->thread_id= thread_id++;
|
thd->thread_id= thread_id++;
|
||||||
threads.append(thd);
|
|
||||||
thread_count++;
|
|
||||||
thread_running++;
|
|
||||||
pthread_mutex_unlock(&LOCK_thread_count);
|
pthread_mutex_unlock(&LOCK_thread_count);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user