summaryrefslogtreecommitdiff
path: root/sql-common/client.c
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg@mysql.com>2010-04-18 15:32:05 +0200
committerJoerg Bruehe <joerg@mysql.com>2010-04-18 15:32:05 +0200
commit4b68b2d289ab338d5bd9c6f15d64e31a1d4be0dc (patch)
treec875ec9df2c1c5133605fe134c52fdb4dc1c30b9 /sql-common/client.c
parent091745c8a571e36a0bc4bb1f2230ef2aa81c00a7 (diff)
parentc62d8e5cb5ae57cedd08f761e99cab0e98f8496a (diff)
downloadmariadb-git-4b68b2d289ab338d5bd9c6f15d64e31a1d4be0dc.tar.gz
Merge the changes of the 5.5.3-m3 release build
back into the development branches.
Diffstat (limited to 'sql-common/client.c')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index ba8923097a6..173d8397bd9 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2350,8 +2350,8 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
(unix_socket || mysql_unix_port) &&
(!host || !strcmp(host,LOCAL_HOST)))
{
- DBUG_PRINT("info", ("Using socket"));
my_socket sock= socket(AF_UNIX, SOCK_STREAM, 0);
+ DBUG_PRINT("info", ("Using socket"));
if (sock == SOCKET_ERROR)
{
set_mysql_extended_error(mysql, CR_SOCKET_CREATE_ERROR,