diff options
author | unknown <monty@hundin.mysql.fi> | 2001-10-19 22:11:19 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-10-19 22:11:19 +0300 |
commit | 87e036a233558d1867b9280679e302f7cc997bee (patch) | |
tree | b61caf8a1475b3e25e877fea95a11cf897db99f3 /libmysql | |
parent | 0889d8dc84bc203a1536485a4c5c711b9f7de17f (diff) | |
parent | 253b9ecb1113131de67df7b8e1b2413a5ee113bb (diff) | |
download | mariadb-git-87e036a233558d1867b9280679e302f7cc997bee.tar.gz |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 0e202a4fc08..be0c01df000 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1002,7 +1002,7 @@ mysql_init(MYSQL *mysql) else bzero((char*) (mysql),sizeof(*(mysql))); mysql->options.connect_timeout=CONNECT_TIMEOUT; -#if defined(SIGPIPE) && defined(THREAD) +#if defined(SIGPIPE) && defined(THREAD) && !defined(__WIN__) if (!((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE)) (void) signal(SIGPIPE,pipe_sig_handler); #endif @@ -1043,7 +1043,7 @@ static void mysql_once_init() mysql_unix_port = env; } mysql_debug(NullS); -#if defined(SIGPIPE) && !defined(THREAD) +#if defined(SIGPIPE) && !defined(THREAD) && !defined(__WIN__) (void) signal(SIGPIPE,SIG_IGN); #endif } |