diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-07-01 12:06:41 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-07-01 12:06:41 +0400 |
| commit | 88ec546247cba2da7785a71255d3100fdce148ca (patch) | |
| tree | b708d98d1300208779f2454df07ffd2ff6a8f988 /sql/mysqld.cc | |
| parent | ea73b23e4a9400452df51b206a56482002ea5d1b (diff) | |
| parent | f3ccf5061fdf7110be6e6f1dd98fe696842081d1 (diff) | |
| download | mariadb-git-88ec546247cba2da7785a71255d3100fdce148ca.tar.gz | |
Manual merge from 5.1.
conflicts:
conflict include/my_alarm.h
Diffstat (limited to 'sql/mysqld.cc')
| -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 28cad51aa41..6602d570c51 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1388,7 +1388,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__) |