bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-07-11 21:46:23-06:00, sasha@stripped
  signal slave thread to stop during shutdown

  sql/slave.cc
    1.118 01/07/11 21:46:21 sasha@stripped +10 -2
    signal slave thread to stop during shutdown

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.117/sql/slave.cc	Tue Jul 10 20:35:41 2001
+++ 1.118/sql/slave.cc	Wed Jul 11 21:46:21 2001
@@ -191,8 +191,16 @@
 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);