From: Date: July 7 2006 6:31pm
Subject: bk commit into 5.1 tree (mats:1.2238) BUG#20850
List-Archive: http://lists.mysql.com/commits/8920
X-Bug: 20850
Message-Id: <20060707163107.2A633F58D8@romeo>

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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-07 18:31:00+02:00, mats@romeo.(none) +1 -0
  Bug#20850 (Assert during slave shutdown in many rpl_* tests):
  Previous patch didn't work: moving variable settings inside critical region.

  sql/slave.cc@stripped, 2006-07-07 18:30:57+02:00, mats@romeo.(none) +3 -3
    Moving variable setting inside critical region (again) when
    terminating slave I/O thread. 

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b20821-mysql-5.1-new-rpl

--- 1.277/sql/slave.cc	2006-07-07 18:31:07 +02:00
+++ 1.278/sql/slave.cc	2006-07-07 18:31:07 +02:00
@@ -3546,12 +3546,12 @@
   THD_CHECK_SENTRY(thd);
   delete thd;
   pthread_mutex_unlock(&LOCK_thread_count);
-  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_mutex_unlock(&mi->run_lock);
+  pthread_cond_broadcast(&mi->stop_cond);       // tell the world we are done
+  my_thread_end();
   pthread_exit(0);
   DBUG_RETURN(0);                               // Can't return anything here
 }