diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-02-19 13:28:10 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-02-19 13:28:10 +0100 |
| commit | 54098cf044025ec5965b8ea9c84750f9631d85b6 (patch) | |
| tree | ed0ef32b379c0cdfe20fcafc5b27c4488732fe90 /ext/mysqli/mysqli_api.c | |
| parent | 8572aeb0703107705fc7dde35961cd6a5f89c0c8 (diff) | |
| download | php-upstream/5.5.0_alpha4.tar.gz | |
Imported Upstream version 5.5.0~alpha4upstream/5.5.0_alpha4
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index f062215e9..70a8cc630 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1629,6 +1629,9 @@ static int mysqli_options_get_option_zval_type(int option) #ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT); #endif /* MySQL 5.1.1., mysqlnd @ PHP 5.3.3 */ +#if MYSQL_VERSION_ID >= 50611 || defined(MYSQLI_USE_MYSQLND) + case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: +#endif return IS_LONG; #ifdef MYSQL_SHARED_MEMORY_BASE_NAME |