From e0349c5cb5e14e1e58a144992835bfff38dd2ce5 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 20 Aug 2009 12:13:38 +0000 Subject: [PATCH] Fixed bug #49306 (inside pdo_mysql default socket settings are ignored). --- ext/pdo_mysql/mysql_driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 0fdaba88904..b23c33b0da1 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 */