database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge from 5.1.

Browse Source 
conflicts:
   conflict      include/my_alarm.h
This commit is contained in:
Alexey Kopytov
2010-07-01 12:06:41 +04:00
parent ea73b23e4a f3ccf5061f
commit 88ec546247
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/libmysql.c
View File

@ -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
}