diff options
| author | Ulf Wendel <uw@php.net> | 2009-10-19 12:09:48 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2009-10-19 12:09:48 +0000 |
| commit | d01d398bad196de230b8e0feabeedd6a727784b6 (patch) | |
| tree | e83d75152575f73aa40fce6e4c35cc39d8cce77e /ext/mysqlnd/mysqlnd.c | |
| parent | a226082475822f57caf32e5e51fef681cca9d364 (diff) | |
| download | php-git-d01d398bad196de230b8e0feabeedd6a727784b6.tar.gz | |
Fixing host info for TCP/IP and aligning mysqlnd and libmysql
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index e2108461d2..c5e3350cbb 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -728,11 +728,12 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, conn->user = pestrdup(user, conn->persistent); conn->passwd = pestrndup(passwd, passwd_len, conn->persistent); conn->port = port; - if (host && !socket) { + + if (!unix_socket) { char *p; conn->host = pestrdup(host, conn->persistent); - spprintf(&p, 0, "MySQL host info: %s via TCP/IP", conn->host); + spprintf(&p, 0, "%s via TCP/IP", conn->host); if (conn->persistent) { conn->host_info = pestrdup(p, 1); mnd_efree(p); @@ -741,7 +742,7 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, } } else { conn->unix_socket = pestrdup(socket, conn->persistent); - conn->host_info = pestrdup("MySQL host info: Localhost via UNIX socket", conn->persistent); + conn->host_info = pestrdup("Localhost via UNIX socket", conn->persistent); } conn->client_flag = auth_packet->client_flags; conn->max_packet_size = auth_packet->max_packet_size; |