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/pdo_mysql | |
| 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/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index c2c0692a96..e53341c718 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -632,6 +632,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) goto cleanup; } +#ifndef PDO_USE_MYSQLND #if PHP_API_VERSION < 20100412 if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) #else @@ -640,6 +641,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options) { local_infile = 0; } +#endif #if defined(MYSQL_OPT_LOCAL_INFILE) || defined(PDO_USE_MYSQLND) if (mysql_options(H->server, MYSQL_OPT_LOCAL_INFILE, (const char *)&local_infile)) { pdo_mysql_error(dbh); |