diff options
| author | msvensson@pilot.(none) <> | 2007-06-26 14:18:53 +0200 |
|---|---|---|
| committer | msvensson@pilot.(none) <> | 2007-06-26 14:18:53 +0200 |
| commit | 058877e05ecd95969b8cb672bb6bc5ebae9f3de1 (patch) | |
| tree | 4d921d1b99defc07656ad6a937678ccc6d9648e9 /sql/mysqld.cc | |
| parent | 8e65f663788cd923b6a0dbd3b6537413c8e48d53 (diff) | |
| download | mariadb-git-058877e05ecd95969b8cb672bb6bc5ebae9f3de1.tar.gz | |
Bug #29133 mysqld does not exit during shutdown
- Fix faulty merge by adding back the 'pthread_kill' call that
wakes up the select thread
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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); |