diff options
author | Joerg Bruehe <joerg@mysql.com> | 2010-04-18 15:32:05 +0200 |
---|---|---|
committer | Joerg Bruehe <joerg@mysql.com> | 2010-04-18 15:32:05 +0200 |
commit | 8dcbf6e20c9528f4e0eedd5e1be1d481215fe3db (patch) | |
tree | c875ec9df2c1c5133605fe134c52fdb4dc1c30b9 /sql-common | |
parent | 24b9ff294cf00ffc5ae78b3b45f3d74bd34faa6f (diff) | |
parent | 29f098f2d3b8cabe352bd255567c4eae4bcfea00 (diff) | |
download | mariadb-git-8dcbf6e20c9528f4e0eedd5e1be1d481215fe3db.tar.gz |
Merge the changes of the 5.5.3-m3 release build
back into the development branches.
Diffstat (limited to 'sql-common')
-rw-r--r-- | sql-common/client.c | 2 |
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, |