Commit 71cf9ab0 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
parents a2cfc204 b1e6157d

libmysql/client_settings.h

+2 −2
Original line number Diff line number Diff line
@@ -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

libmysql/libmysql.c

+3 −3
Original line number Diff line number Diff line
@@ -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

}