From 6781f175753f04e73ec9849cd2d911cf35c85e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Wed, 2 Nov 2011 15:45:53 +0000
Subject: - Fix bug #60155 (pdo_mysql.default_socket ignored).

---
 ext/pdo_mysql/mysql_driver.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ext/pdo_mysql/mysql_driver.c')

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 1cb6674e64..6ec60cd06b 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -553,12 +553,11 @@ static struct pdo_dbh_methods mysql_methods = {
 	pdo_mysql_check_liveness
 };
 /* }}} */
-#ifdef PDO_USE_MYSQLND
-# ifdef PHP_WIN32
-#  define MYSQL_UNIX_ADDR	"MySQL"
-# else
-#  define MYSQL_UNIX_ADDR	PDO_MYSQL_G(default_socket)
-# endif
+
+#ifdef PHP_WIN32
+# define MYSQL_UNIX_ADDR	NULL
+#else
+# define MYSQL_UNIX_ADDR	PDO_MYSQL_G(default_socket)
 #endif
 
 /* {{{ pdo_mysql_handle_factory */
-- 
cgit v1.2.1