Commit 33918998 authored by unknown's avatar unknown
Browse files

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.
parent e69e640f

sql/event_scheduler.cc

+6 −3
Original line number Diff line number Diff line
@@ -123,6 +123,12 @@ post_init_event_thread(THD *thd) 
    VOID(sigemptyset(&set));                    // Get mask in use

  VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));

#endif

  pthread_mutex_lock(&LOCK_thread_count);

  threads.append(thd);

  thread_count++;

  thread_running++;

  pthread_mutex_unlock(&LOCK_thread_count);



  return FALSE;

}
@@ -182,9 +188,6 @@ pre_init_event_thread(THD* thd) 
  thd->client_capabilities|= CLIENT_MULTI_RESULTS;

  pthread_mutex_lock(&LOCK_thread_count);

  thd->thread_id= thread_id++;

  threads.append(thd);

  thread_count++;

  thread_running++;

  pthread_mutex_unlock(&LOCK_thread_count);



  /*