diff options
| author | Andrey Hristov <andrey@php.net> | 2008-07-21 13:01:41 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-07-21 13:01:41 +0000 |
| commit | 0df974b7a599ae424bc7f80c23b4c721d689ce9c (patch) | |
| tree | 11234a3074514c211c8351766f5a76e4c97531b7 /ext/mysqli/mysqli.c | |
| parent | 78bab4d9b306334951474ce296009e1720199cdd (diff) | |
| download | php-git-0df974b7a599ae424bc7f80c23b4c721d689ce9c.tar.gz | |
MFB :
Fix for bug#45179 --with-mysql-sock fails to compile & work
Now --with-mysql-sock controls all mysql extensions. If provided it will be
the default value as it was set in php.ini . php.ini will override it for
ext/mysql and ext/mysqli but not for pdo_mysql
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 7cfa6714c0..f246677539 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -644,7 +644,11 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("mysqli.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_ENTRY("mysqli.default_pw", NULL, PHP_INI_ALL, OnUpdateString, default_pw, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_ENTRY("mysqli.default_port", "3306", PHP_INI_ALL, OnUpdateLong, default_port, zend_mysqli_globals, mysqli_globals) +#ifdef PHP_MYSQL_UNIX_SOCK_ADDR + STD_PHP_INI_ENTRY("mysqli.default_socket", MYSQL_UNIX_ADDR,PHP_INI_ALL,OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals) +#else STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals) +#endif STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals) STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysqli_globals, mysqli_globals) #ifdef MYSQLI_USE_MYSQLND |