diff options
| author | msvensson@neptunus.(none) <> | 2006-05-19 13:10:52 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-05-19 13:10:52 +0200 |
| commit | d04113db05cf6d62f31473fc11d9ff610147ab80 (patch) | |
| tree | f8aabf84893de2b7cc3ed8a39ba8f082f027a64b /sql | |
| parent | da44e731ccb35048e8cde63a82b9a53c70dcebac (diff) | |
| parent | b9a59fa014d4f5ab808030645d6e1812983370f2 (diff) | |
| download | mariadb-git-d04113db05cf6d62f31473fc11d9ff610147ab80.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
Diffstat (limited to 'sql')
| -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 740e1a419c7..9c1089dbdb2 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -884,7 +884,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 |