diff options
| author | monty@narttu.mysql.fi <> | 2003-09-23 13:36:01 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-09-23 13:36:01 +0300 |
| commit | f05a1c83940557721a42c758e26f2adace291d0a (patch) | |
| tree | 367cc7ddc8eef505b0dd3d8bd8d196d7aa8a105f /libmysql | |
| parent | 88faa2ab9554b775f4436bbe5bc051fc5c8e52f5 (diff) | |
| download | mariadb-git-f05a1c83940557721a42c758e26f2adace291d0a.tar.gz | |
Block SIGPIPE also for not threaded client programs.
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 13 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 9e32e60f7da..cd4e8c77f20 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1452,10 +1452,6 @@ mysql_init(MYSQL *mysql) after we return if this is not the case. */ mysql->rpl_pivot = 1; -#if defined(SIGPIPE) && defined(THREAD) && !defined(__WIN__) - if (!((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE)) - (void) signal(SIGPIPE,pipe_sig_handler); -#endif /* Only enable LOAD DATA INFILE by default if configured with @@ -1515,8 +1511,8 @@ void mysql_once_init(void) mysql_unix_port = env; } mysql_debug(NullS); -#if defined(SIGPIPE) && !defined(THREAD) && !defined(__WIN__) - (void) signal(SIGPIPE,SIG_IGN); +#if defined(SIGPIPE) && !defined(__WIN__) + (void) signal(SIGPIPE, SIG_IGN); #endif } #ifdef THREAD @@ -2911,6 +2907,11 @@ mysql_get_client_info(void) return (char*) MYSQL_SERVER_VERSION; } +ulong STDCALL mysql_get_client_version(void) +{ + return MYSQL_VERSION_ID; +} + int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index baa8643b92d..542ab890e95 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -24,6 +24,7 @@ EXPORTS mysql_get_host_info mysql_get_proto_info mysql_get_server_info + mysql_get_client_version mysql_info mysql_init mysql_insert_id |