mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
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.
This commit is contained in:
parent
c98077d610
commit
20ae925c7d
1 changed files with 3 additions and 2 deletions
|
@ -426,11 +426,12 @@ 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
|
||||
close_active_vio();
|
||||
else
|
||||
close_active_vio();
|
||||
#endif
|
||||
if (mysys_var)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue