summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-06-16 01:13:23 +0300
committerunknown <monty@narttu.mysql.fi>2003-06-16 01:13:23 +0300
commit19a4898c723f05fdf60dafbe591d848ce047654c (patch)
treee40ccf01733bdd098e3272d6a27ad63381400ab4 /sql-common
parented1d28fdb6b6c828556917716c9b700bf7450426 (diff)
parent7ababc3bb43193f2e9d01267d65319291001d980 (diff)
downloadmariadb-git-19a4898c723f05fdf60dafbe591d848ce047654c.tar.gz
merge
sql-common/client.c: Auto merged scripts/mysql_install_db.sh: Use local version
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 66a073ed53f..33f2b996971 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);