From fa4e355daccd94b7263ca61afa1f95321d4bb5dc Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Wed, 11 Jul 2001 21:33:19 -0600 Subject: [PATCH] send kill signal to slave thread on shutdown --- sql/slave.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sql/slave.cc b/sql/slave.cc index d758db1abd1..17420b8fde9 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -190,8 +190,16 @@ static void free_string_array(DYNAMIC_ARRAY *a) void end_slave() { pthread_mutex_lock(&LOCK_slave); - while (slave_running) - pthread_cond_wait(&COND_slave_stopped, &LOCK_slave); + if (slave_running) + { + abort_slave = 1; + thr_alarm_kill(slave_real_id); +#ifdef SIGNAL_WITH_VIO_CLOSE + slave_thd->close_active_vio(); +#endif + while (slave_running) + pthread_cond_wait(&COND_slave_stopped, &LOCK_slave); + } pthread_mutex_unlock(&LOCK_slave); end_master_info(&glob_mi);