diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:54 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:54 +0800 |
| commit | 5bdc5f4e2be9fce97e7639356b9d6c26e32de679 (patch) | |
| tree | 244fff27352f6ed8b3c3208242fd6becd5b671a0 /ext/mysqli/mysqli_api.c | |
| parent | 48325aba87636f15678c29af459f3df7ea873678 (diff) | |
| parent | 9134f9e98f6ccf8ed91cd1271fee7855062c07ff (diff) | |
| download | php-git-5bdc5f4e2be9fce97e7639356b9d6c26e32de679.tar.gz | |
Merge branch 'PHP-7.0'
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 0e8289c1fc..911ff9c8d1 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1780,6 +1780,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 @@ -1789,6 +1790,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) { |