Merge pilot.(none):/data/msvensson/mysql/bug29133/my51-bug29133

into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint sql/mysqld.cc: Auto merged
2007-06-27 09:15:17 +02:00 · 2007-06-27 09:15:17 +02:00 · 7dafa50a77
commit 7dafa50a77
parent a97c05e0ad 865ac1a2b3
1 changed files with 1 additions and 0 deletions
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@ -762,6 +762,7 @@ static void close_connections(void)
    DBUG_PRINT("info",("Waiting for select thread"));

 #ifndef DONT_USE_THR_ALARM
+    if (pthread_kill(select_thread, thr_client_alarm))
      break;					// allready dead
 #endif
    set_timespec(abstime, 2);