bk commit into 4.1 tree (jimw:1.2371)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2371 05/08/10 10:07:46 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-4.1-11796

  sql/mysqld.cc
    1.585 05/08/10 10:07:43 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-11796/RESYNC

--- 1.584/sql/mysqld.cc	2005-08-04 03:22:35 -07:00
+++ 1.585/sql/mysqld.cc	2005-08-10 10:07:43 -07:00
@@ -649,7 +649,6 @@
   }
 #endif
   end_thr_alarm(0);			 // Abort old alarms.
-  end_slave();
 
   /*
     First signal all threads that it's time to die
@@ -665,6 +664,9 @@
   {
     DBUG_PRINT("quit",("Informing thread %ld that it's time to die",
 		       tmp->thread_id));
+    /* We skip slave threads on this first loop through. */
+    if (tmp->slave_thread) continue;
+
     tmp->killed= 1;
     if (tmp->mysys_var)
     {
@@ -680,6 +682,8 @@
     }
   }
   (void) pthread_mutex_unlock(&LOCK_thread_count); // For unlink from list
+
+  end_slave();
 
   if (thread_count)
     sleep(2);					// Give threads time to die