diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:46 +0800 |
| commit | 9134f9e98f6ccf8ed91cd1271fee7855062c07ff (patch) | |
| tree | de92106b2946eee73b51643504a2bcdc235e0fcc /ext/mysqli/mysqli_api.c | |
| parent | 0dce4bef7933920ef151f1f2ef7416f6a5da2afb (diff) | |
| parent | 25439e939e8d6a86bcc1654221460851b43271d5 (diff) | |
| download | php-git-9134f9e98f6ccf8ed91cd1271fee7855062c07ff.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/mysql/php_mysql.c
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index ce33fa832a..20f22297e8 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1776,6 +1776,7 @@ PHP_FUNCTION(mysqli_options) } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED); +#if !defined(MYSQLI_USE_MYSQLND) #if PHP_API_VERSION < 20100412 if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) { #else @@ -1785,6 +1786,7 @@ PHP_FUNCTION(mysqli_options) RETURN_FALSE; } } +#endif expected_type = mysqli_options_get_option_zval_type(mysql_option); if (expected_type != Z_TYPE_P(mysql_value)) { switch (expected_type) { |