diff options
| author | unknown <monty@mysql.com> | 2004-05-26 19:13:12 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-26 19:13:12 +0300 |
| commit | c2f6dff9f4abb3072e81cfe8eb6ad2e41475ad18 (patch) | |
| tree | 4280800370471555015002987bc9f1f976b47f4e /libmysql | |
| parent | 5eea01a76465f35492046bac95e0b73557f0473d (diff) | |
| parent | 30bffb0213dbc5b52823b167de71dd96aff1bf16 (diff) | |
| download | mariadb-git-c2f6dff9f4abb3072e81cfe8eb6ad2e41475ad18.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.def | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 63f447ea1b9..7a376cad736 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -149,7 +149,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), mysql_unix_port = env; } mysql_debug(NullS); -#if defined(SIGPIPE) && !defined(__WIN__) +#if defined(SIGPIPE) && !defined(__WIN__) && !defined(__NETWARE__) (void) signal(SIGPIPE, SIG_IGN); #endif #ifdef EMBEDDED_LIBRARY diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def index 1790b0fa888..91691a2986a 100644 --- a/libmysql/libmysql.def +++ b/libmysql/libmysql.def @@ -81,7 +81,6 @@ EXPORTS mysql_stmt_param_count mysql_stmt_param_metadata mysql_ping - mysql_prepare mysql_stmt_result_metadata mysql_query mysql_read_query_result @@ -114,6 +113,9 @@ EXPORTS mysql_thread_safe mysql_use_result mysql_warning_count + mysql_stmt_sqlstate + mysql_sqlstate + mysql_get_server_version net_buffer_length set_dynamic strcend |