diff options
| author | unknown <hf@deer.(none)> | 2003-06-16 03:13:22 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-16 03:13:22 +0500 |
| commit | fff9d1cd34d10c1ec3f3bf25ca5b7138f1116ed2 (patch) | |
| tree | 7c772fd814663db46d945e901af92569e7fac238 | |
| parent | 10051610307c45cf0cb5c4a1cbe4145e63dce94a (diff) | |
| download | mariadb-git-fff9d1cd34d10c1ec3f3bf25ca5b7138f1116ed2.tar.gz | |
Fix for compilation error.
Compiler can signal error when init_sigpipe_variables expands as empty place.
Had to remove all semicolons after init_sigpipe_variables
libmysql/client_settings.h:
semicolon added
sql-common/client.c:
we don't need semicolons after init_sigpipe_variables
| -rw-r--r-- | libmysql/client_settings.h | 2 | ||||
| -rw-r--r-- | sql-common/client.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index 8c28de73866..17e992be5b0 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -31,7 +31,7 @@ my_bool send_file_to_server(MYSQL *mysql, const char *filename); */ #if !defined(__WIN__) && defined(SIGPIPE) && !defined(THREAD) -#define init_sigpipe_variables sig_return old_signal_handler=(sig_return) 0 +#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 reset_sigpipe(mysql) if ((mysql)->client_flag & CLIENT_IGNORE_SIGPIPE) signal(SIGPIPE,old_signal_handler); #else diff --git a/sql-common/client.c b/sql-common/client.c index 1f0f67e4ff1..abeb64e82fb 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -514,7 +514,7 @@ net_safe_read(MYSQL *mysql) { NET *net= &mysql->net; ulong len=0; - init_sigpipe_variables; + init_sigpipe_variables /* Don't give sigpipe errors if the client doesn't want them */ set_sigpipe(mysql); @@ -579,7 +579,7 @@ advanced_command(MYSQL *mysql, enum enum_server_command command, { NET *net= &mysql->net; my_bool result= 1; - init_sigpipe_variables; + init_sigpipe_variables /* Don't give sigpipe errors if the client doesn't want them */ set_sigpipe(mysql); @@ -670,7 +670,7 @@ void end_server(MYSQL *mysql) DBUG_ENTER("end_server"); if (mysql->net.vio != 0) { - init_sigpipe_variables; + init_sigpipe_variables DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio))); set_sigpipe(mysql); vio_delete(mysql->net.vio); @@ -1431,7 +1431,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, #ifdef HAVE_SYS_UN_H struct sockaddr_un UNIXaddr; #endif - init_sigpipe_variables; + init_sigpipe_variables DBUG_ENTER("mysql_real_connect"); LINT_INIT(host_info); |