diff options
| author | istruewing@chilla.local <> | 2007-02-02 23:05:46 +0100 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-02-02 23:05:46 +0100 |
| commit | 77e99fe2cee275cbdebee1801013b0d1c84522aa (patch) | |
| tree | 460389b26977e71c319a4b21f9caa45f3928a060 /sql/mysqld.cc | |
| parent | 41b6b32ef79e6f8a4be2b1e6b7613a206a2178a6 (diff) | |
| parent | 972df14cc6554a4950085d1c94ca1fe738583988 (diff) | |
| download | mariadb-git-77e99fe2cee275cbdebee1801013b0d1c84522aa.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5dcfc45be6f..d14e7308718 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3349,7 +3349,11 @@ int main(int argc, char **argv) DEBUGGER_OFF; /* Set signal used to kill MySQL */ +#if defined(SIGUSR2) thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2; +#else + thr_kill_signal= SIGINT; +#endif #ifdef _CUSTOMSTARTUPCONFIG_ if (_cust_check_startup()) |