diff options
| author | unknown <msvensson@devsrv-b.mysql.com> | 2006-05-19 13:16:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@devsrv-b.mysql.com> | 2006-05-19 13:16:06 +0200 |
| commit | 8dff422f0bf901c0d8cc8f975df635df0fe03762 (patch) | |
| tree | 2c26be96c4fb70e388f087a889a619e43eacc16e /sql/mysqld.cc | |
| parent | 41e6fb25905de41e4b24a02e4fddd82cadb8fa1e (diff) | |
| parent | f98e7a9e13a5a66957c21e25da6151d4ee9d9ee8 (diff) | |
| download | mariadb-git-8dff422f0bf901c0d8cc8f975df635df0fe03762.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 004b1761c77..ee4fcb82e97 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -954,7 +954,8 @@ static void __cdecl kill_server(int sig_ptr) RETURN_FROM_KILL_SERVER; kill_in_progress=TRUE; abort_loop=1; // This should be set - my_sigset(sig,SIG_IGN); + if (sig != 0) // 0 is not a valid signal number + my_sigset(sig,SIG_IGN); if (sig == MYSQL_KILL_SIGNAL || sig == 0) sql_print_information(ER(ER_NORMAL_SHUTDOWN),my_progname); else |