diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-25 08:53:26 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-25 08:53:26 -0700 |
| commit | 979194351d0e29a7560d0224c20f4b9f85dd5777 (patch) | |
| tree | 70ac445c704dfddb5c003e2c7042db97eb224de6 /ext/pdo_mysql/mysql_driver.c | |
| parent | a1bf38e075ce7d6bbcbcf570444f13ea7558fa41 (diff) | |
| parent | 515092917d8c31ea4fb2d80598dd672511717e4e (diff) | |
| download | php-git-979194351d0e29a7560d0224c20f4b9f85dd5777.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Xinchen Hui (2) and others
# Via Stanislav Malyshev (1) and Xinchen Hui (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Upper section name
Fixed bug #65328 (Segfault when getting SplStack object Value)
Fix compiler warning on redefined constant
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -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 a703f93e7c..32d13bafaf 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 |