database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Merge branch 'master' of https://github.com/MariaDB/mariadb-connector-c

Browse Source
This commit is contained in:
Georg Richter
2016-06-01 20:23:57 +02:00
parent 3d83b9bcee 7496789f10
commit ac651213eb
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libmariadb/mariadb_lib.c
View File

@@ -3473,13 +3473,6 @@ BOOL CALLBACK win_init_once(
}
#endif
#if defined(SIGPIPE) && !defined(_WIN32) && defined(WITH_OPENSSL)
static void ma_sigpipe_handler()
{
return;
}
#endif
int STDCALL mysql_server_init(int argc __attribute__((unused)),
char **argv __attribute__((unused)),
char **groups __attribute__((unused)))
@@ -3490,17 +3483,6 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
return ret? 0: 1;
#else
static pthread_once_t init_once = PTHREAD_ONCE_INIT;
#if defined(SIGPIPE) && defined(WITH_OPENSSL)
struct sigaction old_handler, new_handler={NULL};
if (!sigaction (SIGPIPE, NULL, &old_handler) &&
!old_handler.sa_handler)
{
new_handler.sa_handler= ma_sigpipe_handler;
new_handler.sa_flags= 0;
if (!sigemptyset(&new_handler.sa_mask))
sigaction(SIGPIPE, &new_handler, NULL);
}
#endif
return pthread_once(&init_once, mysql_once_init);
#endif
}