diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-07-23 12:57:08 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-07-23 12:57:08 +0200 |
| commit | 5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec (patch) | |
| tree | 602d786dc4df224017db9d9950ca85ab99698c9e /ext/pdo_mysql | |
| parent | 063e10b275159dc9d50228f451f94d6990a41f6d (diff) | |
| parent | c28ab73d7346e332594c30a9a544cfd74b8bc5bb (diff) | |
| download | php-git-5a8b0ca8fa00fdc70b2d55be02ef9d7472990bec.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 54c2e8dd84..bf90f43161 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -527,9 +527,9 @@ static struct pdo_dbh_methods mysql_methods = { /* }}} */ #ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR NULL +# define PDO_DEFAULT_MYSQL_UNIX_ADDR NULL #else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +# define PDO_DEFAULT_MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) #endif /* {{{ pdo_mysql_handle_factory */ @@ -545,7 +545,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ { "dbname", "", 0 }, { "host", "localhost", 0 }, { "port", "3306", 0 }, - { "unix_socket", MYSQL_UNIX_ADDR, 0 }, + { "unix_socket", PDO_DEFAULT_MYSQL_UNIX_ADDR, 0 }, }; int connect_opts = 0 #ifdef CLIENT_MULTI_RESULTS |