From: Date: July 7 2006 9:49am
Subject: bk commit into 5.1 tree (grog:1.2234) BUG#20850
List-Archive: http://lists.mysql.com/commits/8890
X-Bug: 20850
Message-Id: <20060707074909.4B1F6C87F5@eucla.lemis.com>

Below is the list of changes that have just been committed into a local
5.1 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
  1.2234 06/07/07 17:18:52 grog@stripped +1 -0
  slave.cc:
    BUG#20850: Assert during slave shutdown in many rpl_* tests.
    This was caused by a race condition at the end of handle_slave_io
    which under some circumstances allowed the cleanup to proceed before
    the thread had completed.

  sql/slave.cc
    1.277 06/07/07 17:18:20 grog@stripped +3 -3
    BUG#20850: Assert during slave shutdown in many rpl_* tests.
    This was caused by a race condition at the end of handle_slave_io
    which under some circumstances allowed the cleanup to proceed before
    the thread had completed.

# 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.1-Bug-20850

--- 1.276/sql/slave.cc	2006-07-07 16:57:05 +09:30
+++ 1.277/sql/slave.cc	2006-07-07 17:18:20 +09:30
@@ -3533,15 +3533,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);
@@ -3552,6 +3549,9 @@
   pthread_cond_broadcast(&mi->stop_cond);       // tell the world we are done
   pthread_mutex_unlock(&mi->run_lock);
   my_thread_end();
+  mi->abort_slave = 0;
+  mi->slave_running = 0;
+  mi->io_thd = 0;
   pthread_exit(0);
   DBUG_RETURN(0);                               // Can't return anything here
 }