diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-02-17 23:04:13 +0200 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-02-17 23:04:13 +0200 |
| commit | 6890b0aa5ea90b2fa902b1337b1451b73243b144 (patch) | |
| tree | f43ba07c5e9aabd1b2cd8d29a104eeb6700c45d8 | |
| parent | 15ddb5c4ca9fe3e63d792da50a81cf1bca1e2544 (diff) | |
| parent | a6106a0a67e038d1781a57a3cfbdd84b0d71801f (diff) | |
| download | mariadb-git-6890b0aa5ea90b2fa902b1337b1451b73243b144.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
| -rw-r--r-- | libmysql/client_settings.h | 4 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 375e75919a4..e0f093aa7c9 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -21,7 +21,7 @@ extern my_string mysql_unix_port; CLIENT_TRANSACTIONS | \ CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION) -sig_handler pipe_sig_handler(int sig); +sig_handler my_pipe_sig_handler(int sig); void read_user_name(char *name); my_bool handle_local_infile(MYSQL *mysql, const char *net_filename); @@ -32,7 +32,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename); #if !defined(__WIN__) && defined(SIGPIPE) && !defined(THREAD) #define init_sigpipe_variables sig_return old_signal_handler=(sig_return) 0; -#define set_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) old_signal_handler=signal(SIGPIPE,pipe_sig_handler) +#define set_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) old_signal_handler=signal(SIGPIPE, my_pipe_sig_handler) #define reset_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) signal(SIGPIPE,old_signal_handler); #else #define init_sigpipe_variables diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 6baec95e633..1ef29210c0b 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -92,7 +92,7 @@ my_bool net_flush(NET *net); #define unsigned_field(A) ((A)->flags & UNSIGNED_FLAG) static void append_wild(char *to,char *end,const char *wild); -sig_handler pipe_sig_handler(int sig); +sig_handler my_pipe_sig_handler(int sig); static my_bool mysql_client_init= 0; static my_bool org_my_init_done= 0; @@ -294,11 +294,11 @@ mysql_debug(const char *debug __attribute__((unused))) **************************************************************************/ sig_handler -pipe_sig_handler(int sig __attribute__((unused))) +my_pipe_sig_handler(int sig __attribute__((unused))) { DBUG_PRINT("info",("Hit by signal %d",sig)); #ifdef DONT_REMEMBER_SIGNAL - (void) signal(SIGPIPE,pipe_sig_handler); + (void) signal(SIGPIPE, my_pipe_sig_handler); #endif } |