Commit 3b1eabe8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-11796 

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
parents 21bb08e8 ac28ad5d

sql/mysqld.cc

+5 −1
Original line number Diff line number Diff line
@@ -649,7 +649,6 @@ static void close_connections(void) 
  }

#endif

  end_thr_alarm(0);			 // Abort old alarms.

  end_slave();



  /*

    First signal all threads that it's time to die
@@ -665,6 +664,9 @@ static void close_connections(void) 
  {

    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)

    {
@@ -681,6 +683,8 @@ static void close_connections(void) 
  }

  (void) pthread_mutex_unlock(&LOCK_thread_count); // For unlink from list



  end_slave();



  if (thread_count)

    sleep(2);					// Give threads time to die