diff options
Diffstat (limited to 'sql/event_scheduler.cc')
| -rw-r--r-- | sql/event_scheduler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index 2423fac4ca6..e02b618a80a 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -156,7 +156,7 @@ deinit_event_thread(THD *thd) mysql_mutex_unlock(&LOCK_thread_count); delete thd; - thread_safe_decrement32(&thread_count, &thread_count_lock); + thread_safe_decrement32(&thread_count); signal_thd_deleted(); } @@ -186,12 +186,12 @@ pre_init_event_thread(THD* thd) thd->security_ctx->master_access= 0; thd->security_ctx->db_access= 0; thd->security_ctx->host_or_ip= (char*)my_localhost; - my_net_init(&thd->net, NULL, MYF(MY_THREAD_SPECIFIC)); + my_net_init(&thd->net, NULL, thd, MYF(MY_THREAD_SPECIFIC)); thd->security_ctx->set_user((char*)"event_scheduler"); thd->net.read_timeout= slave_net_timeout; thd->variables.option_bits|= OPTION_AUTO_IS_NULL; thd->client_capabilities|= CLIENT_MULTI_RESULTS; - thread_safe_increment32(&thread_count, &thread_count_lock); + thread_safe_increment32(&thread_count); mysql_mutex_lock(&LOCK_thread_count); thd->thread_id= thd->variables.pseudo_thread_id= thread_id++; threads.append(thd); |