From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 20 Aug 2009 12:13:38 +0000 (+0000)
Subject: Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
X-Git-Tag: php-5.4.0alpha1~191^2~2777
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0349c5cb5e14e1e58a144992835bfff38dd2ce5;p=php

Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
---

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 0fdaba8890..b23c33b0da 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -552,12 +552,10 @@ static struct pdo_dbh_methods mysql_methods = {
 };
 /* }}} */
 
-#ifndef PDO_MYSQL_UNIX_ADDR
-# 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	"MySQL"
+#else
+# define MYSQL_UNIX_ADDR	PDO_MYSQL_G(default_socket)
 #endif
 
 /* {{{ pdo_mysql_handle_factory */