diff options
| author | Johannes Schlüter <johannes@php.net> | 2011-11-02 15:45:53 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2011-11-02 15:45:53 +0000 |
| commit | 6781f175753f04e73ec9849cd2d911cf35c85e1e (patch) | |
| tree | 3610dd31f5b4a6937d707a4605750c073400643e /ext/pdo_mysql/mysql_driver.c | |
| parent | e3269e029e15127835aeac989b3d528372fd66f9 (diff) | |
| download | php-git-6781f175753f04e73ec9849cd2d911cf35c85e1e.tar.gz | |
- Fix bug #60155 (pdo_mysql.default_socket ignored).
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 11 |
1 files changed, 5 insertions, 6 deletions
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 */ |