diff options
| author | msvensson@pilot.(none) <> | 2007-06-27 09:15:17 +0200 |
|---|---|---|
| committer | msvensson@pilot.(none) <> | 2007-06-27 09:15:17 +0200 |
| commit | 7f22aaea9632de36dbfa468eb08e95b142101b7e (patch) | |
| tree | 07a78c6352d28f6ddd5a5337d593e3c1c86dc498 /sql | |
| parent | cc8cccc71d68e5543702f4164fe2ba3a76518cbb (diff) | |
| parent | 058877e05ecd95969b8cb672bb6bc5ebae9f3de1 (diff) | |
| download | mariadb-git-7f22aaea9632de36dbfa468eb08e95b142101b7e.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/bug29133/my51-bug29133
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'sql')
| -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 39a7c4e9095..10ae466fe4d 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); |