diff options
| author | Andrey Hristov <andrey.hristov@dnhsoft.com> | 2016-10-17 19:11:54 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey.hristov@dnhsoft.com> | 2016-10-17 19:11:54 +0300 |
| commit | 7108db3022ccafaef42d82457e7982cd73daa321 (patch) | |
| tree | 1e17cde44f711781584c98e236a66adb3ab42689 /ext/mysqli/mysqli_api.c | |
| parent | 63166412a2d22ddb58ef40a9dd5872d9ac0369be (diff) | |
| parent | 66d4a2e13fa4702b4feb8d91f414dd0206b14955 (diff) | |
| download | php-git-7108db3022ccafaef42d82457e7982cd73daa321.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 7b403dff08..fb522130d6 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1712,14 +1712,14 @@ static int mysqli_options_get_option_zval_type(int option) #ifdef MYSQL_OPT_PROTOCOL case MYSQL_OPT_PROTOCOL: #endif /* MySQL 4.1.0 */ -#ifdef MYSQL_OPT_READ_TIMEOUT +#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND) case MYSQL_OPT_READ_TIMEOUT: case MYSQL_OPT_WRITE_TIMEOUT: case MYSQL_OPT_GUESS_CONNECTION: case MYSQL_OPT_USE_EMBEDDED_CONNECTION: case MYSQL_OPT_USE_REMOTE_CONNECTION: case MYSQL_SECURE_AUTH: -#endif /* MySQL 4.1.1 */ +#endif #ifdef MYSQL_OPT_RECONNECT case MYSQL_OPT_RECONNECT: #endif /* MySQL 5.0.13 */ |