diff options
| author | monty@bitch.mysql.fi <> | 2001-08-11 11:24:43 +0300 |
|---|---|---|
| committer | monty@bitch.mysql.fi <> | 2001-08-11 11:24:43 +0300 |
| commit | df7a29214abc72ce5488ad81e5dd4d73c8a6ed5b (patch) | |
| tree | c356f42d27c0a877c40c8d8b90d7cfc871dda3d6 /sql/mysqld.cc | |
| parent | 65a711f40f8b64246cd4a18745552bc22e621f23 (diff) | |
| download | mariadb-git-df7a29214abc72ce5488ad81e5dd4d73c8a6ed5b.tar.gz | |
Made SIGTERM safer for Solaris
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 99d05fa73e4..49c8be0f363 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -576,16 +576,16 @@ void kill_mysql(void) // CloseHandle(hEvent); } #elif defined(HAVE_PTHREAD_KILL) - if (pthread_kill(signal_thread,SIGTERM)) /* End everything nicely */ - { - DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov: inspected */ - } + if (pthread_kill(signal_thread,MYSQL_KILL_SIGNAL))// End everything nicely + { + DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov: inspected */ + } #else - kill(current_pid,SIGTERM); + kill(current_pid,MYSQL_KILL_SIGNAL); #endif - DBUG_PRINT("quit",("After pthread_kill")); - shutdown_in_progress=1; // Safety if kill didn't work - DBUG_VOID_RETURN; + DBUG_PRINT("quit",("After pthread_kill")); + shutdown_in_progress=1; // Safety if kill didn't work + DBUG_VOID_RETURN; } @@ -1248,8 +1248,8 @@ static void init_signals(void) sigaddset(&set,SIGQUIT); sigaddset(&set,SIGTERM); sigaddset(&set,SIGHUP); - signal(SIGTERM,SIG_DFL); // If it's blocked by parent - signal(SIGHUP,SIG_DFL); // If it's blocked by parent + sigset(SIGTERM,print_signal_warning); // If it's blocked by parent + signal(SIGHUP,print_signal_warning); // If it's blocked by parent #ifdef SIGTSTP sigaddset(&set,SIGTSTP); #endif @@ -1344,7 +1344,7 @@ static void *signal_hand(void *arg __attribute__((unused))) int error; // Used when debugging if (shutdown_in_progress && !abort_loop) { - sig=SIGTERM; + sig= MYSQL_KILL_SIGNAL; error=0; } else |