diff options
| author | serg@sergbook.mysql.com <> | 2007-03-24 14:05:27 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2007-03-24 14:05:27 +0200 |
| commit | 1af6b027d68bbd3e95077609283858e003ab7c73 (patch) | |
| tree | 5d4cbb9452b7d2859bc8b1a3943ae02a6d09a9cd /sql/mysqld.cc | |
| parent | 77718a3fc19e0e7854a94c4aad3342b04053977c (diff) | |
| parent | 18a01e72619008ad35b749711d5913e03c330968 (diff) | |
| download | mariadb-git-1af6b027d68bbd3e95077609283858e003ab7c73.tar.gz | |
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0d095393e9f..a4df838aa46 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -704,7 +704,7 @@ static void close_connections(void) DBUG_PRINT("info",("Waiting for select thread")); #ifndef DONT_USE_THR_ALARM - if (pthread_kill(select_thread, THR_SERVER_ALARM)) + if (pthread_kill(select_thread, thr_client_alarm)) break; // allready dead #endif set_timespec(abstime, 2); @@ -2238,6 +2238,8 @@ static void init_signals(void) #ifdef SIGTSTP sigaddset(&set,SIGTSTP); #endif + if (thd_lib_detected != THD_LIB_LT) + sigaddset(&set,THR_SERVER_ALARM); if (test_flags & TEST_SIGINT) { // May be SIGINT @@ -3422,7 +3424,7 @@ int main(int argc, char **argv) #if defined(SIGUSR2) thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; #else - thr_kill_signal= thd_lib_detected == SIGINT; + thr_kill_signal= SIGINT; #endif #ifdef _CUSTOMSTARTUPCONFIG_ |