bk commit into 5.0 tree (grog:1.2218) BUG#20850

[Greg Lehey]

Below is the list of changes that have just been committed into a local
5.0 repository of grog. When grog does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-25 13:48:03+09:30, grog@stripped +1 -0
  slave.cc:
    BUG#20850: Assert during slave shutdown in many rpl_* tests
    This patch has already been applied to 5.1.
    Apply now to 5.0.25.

  sql/slave.cc@stripped, 2006-07-25 13:34:27+09:30, grog@stripped +4 -4
    BUG#20850: Assert during slave shutdown in many rpl_* tests
    This patch has already been applied to 5.1.
    Apply now to 5.0.25.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	grog
# Host:	eucla.lemis.com
# Root:	/home/MySQL/5.0-base

--- 1.274/sql/slave.cc	2006-07-25 13:48:08 +09:30
+++ 1.275/sql/slave.cc	2006-07-25 13:48:08 +09:30
@@ -3717,15 +3717,12 @@
   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 @@
   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;