Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b16900 sql/sql_class.cc: Auto merged
This commit is contained in:
commit
ee527a9a7d
@ -426,11 +426,12 @@ void THD::awake(bool prepare_to_die)
|
|||||||
THD_CHECK_SENTRY(this);
|
THD_CHECK_SENTRY(this);
|
||||||
safe_mutex_assert_owner(&LOCK_delete);
|
safe_mutex_assert_owner(&LOCK_delete);
|
||||||
|
|
||||||
|
thr_alarm_kill(real_id);
|
||||||
if (prepare_to_die)
|
if (prepare_to_die)
|
||||||
killed = 1;
|
killed = 1;
|
||||||
thr_alarm_kill(real_id);
|
|
||||||
#ifdef SIGNAL_WITH_VIO_CLOSE
|
#ifdef SIGNAL_WITH_VIO_CLOSE
|
||||||
close_active_vio();
|
else
|
||||||
|
close_active_vio();
|
||||||
#endif
|
#endif
|
||||||
if (mysys_var)
|
if (mysys_var)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user