Skip to content

M
MariaDB
Commit f3b4cbb9 authored by andrey@example.com's avatar andrey@example.com
Browse files
Options

Fix a crash of SHOW PROCESSLIST

parent 0404763d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
sql/event_scheduler.cc
View file @ f3b4cbb9
...@@ -123,6 +123,12 @@ post_init_event_thread(THD *thd) ...@@ -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) ...@@ -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);
/* /*
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7