diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-07-01 12:10:35 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-07-01 12:10:35 +0400 |
| commit | 82b8bc6e6bb2361d30e56ee232633f3ab421727a (patch) | |
| tree | 1989c6cbbeb0d5161a1adbab84f88f0396de4777 /sql | |
| parent | 1c5388765fc121ca8e5458df80c955bc209841db (diff) | |
| parent | f3ccf5061fdf7110be6e6f1dd98fe696842081d1 (diff) | |
| download | mariadb-git-82b8bc6e6bb2361d30e56ee232633f3ab421727a.tar.gz | |
Automerge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index adf9ff19326..5514c356bd1 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1232,7 +1232,7 @@ extern "C" sig_handler print_signal_warning(int sig) { if (global_system_variables.log_warnings) sql_print_warning("Got signal %d from thread %ld", sig,my_thread_id()); -#ifdef DONT_REMEMBER_SIGNAL +#ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY my_sigset(sig,print_signal_warning); /* int. thread system calls */ #endif #if !defined(__WIN__) && !defined(__NETWARE__) |