From cd64ea0eaba3b18fc19dcc43fedd6b0e61e940c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Jul 2006 20:00:18 +0930 Subject: slave.cc: BUG#20850: Assert during slave shutdown in many rpl_* tests This patch has already been applied to 5.1. sql/slave.cc: BUG#20850: Assert during slave shutdown in many rpl_* tests This patch has already been applied to 5.1. --- sql/slave.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index b284f4a6a16..90e95e812bd 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3717,15 +3717,12 @@ err: write_ignored_events_info_to_relay_log(thd, mi); thd->proc_info = "Waiting for slave mutex on exit"; pthread_mutex_lock(&mi->run_lock); - mi->slave_running = 0; - mi->io_thd = 0; /* Forget the relay log's format */ delete mi->rli.relay_log.description_event_for_queue; mi->rli.relay_log.description_event_for_queue= 0; // TODO: make rpl_status part of MASTER_INFO change_rpl_status(RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE); - mi->abort_slave = 0; // TODO: check if this is needed DBUG_ASSERT(thd->net.buff != 0); net_end(&thd->net); // destructor will not free it, because net.vio is 0 close_thread_tables(thd, 0); @@ -3733,8 +3730,11 @@ err: THD_CHECK_SENTRY(thd); delete thd; pthread_mutex_unlock(&LOCK_thread_count); - pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done + mi->abort_slave= 0; + mi->slave_running= 0; + mi->io_thd= 0; pthread_mutex_unlock(&mi->run_lock); + pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done #ifndef DBUG_OFF if (abort_slave_event_count && !events_till_abort) goto slave_begin; -- cgit v1.2.1