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 | 92f7433d71f7f4d137589e429d26cc4fb7eedc03 (patch) | |
| tree | b708d98d1300208779f2454df07ffd2ff6a8f988 /libmysql/libmysql.c | |
| parent | 149d305484b1aaa5334b37554f24abd37adcd16b (diff) | |
| parent | ac89d92625a0ebf7ba70de0412b38e5cefdf2dda (diff) | |
| download | mariadb-git-92f7433d71f7f4d137589e429d26cc4fb7eedc03.tar.gz | |
Manual merge from 5.1.
conflicts:
conflict include/my_alarm.h
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 901fa1f0c4c..5730b7abdc4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -318,7 +318,7 @@ sig_handler my_pipe_sig_handler(int sig __attribute__((unused))) { DBUG_PRINT("info",("Hit by signal %d",sig)); -#ifdef DONT_REMEMBER_SIGNAL +#ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY (void) signal(SIGPIPE, my_pipe_sig_handler); #endif } |