From 865ac1a2b3c8cc3353f8a21914fa71a877e85936 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Jun 2007 14:18:53 +0200 Subject: [PATCH] Bug #29133 mysqld does not exit during shutdown - Fix faulty merge by adding back the 'pthread_kill' call that wakes up the select thread sql/mysqld.cc: Wake up the select thread from 'close_connections', caused by faulty merge --- sql/mysqld.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 12cab1c6de6..cdb6ee616db 100644 --- 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);