Commit 20ae925c authored by unknown's avatar unknown
Browse files

Fix for bug #16900: Crash during query "reap" on OS X. 


sql/sql_class.cc:
  Fix for bug #16900: Crash during query "reap" on OS X.
  -  call close_active_vio() only if we don't kill the thread.
parent c98077d6

sql/sql_class.cc

+3 −2
Original line number Diff line number Diff line
@@ -426,10 +426,11 @@ void THD::awake(bool prepare_to_die) 
  THD_CHECK_SENTRY(this);

  safe_mutex_assert_owner(&LOCK_delete); 



  thr_alarm_kill(real_id);

  if (prepare_to_die)

    killed = 1;

  thr_alarm_kill(real_id);

#ifdef SIGNAL_WITH_VIO_CLOSE

  else

    close_active_vio();

#endif    

  if (mysys_var)