diff options
author | Andrey Hristov <andrey@php.net> | 2013-05-14 11:26:35 +0200 |
---|---|---|
committer | Andrey Hristov <andrey@php.net> | 2013-05-14 11:26:35 +0200 |
commit | 9d2dda90588cbc9dbf76db30389490cd37d097d9 (patch) | |
tree | 7309f7a5d469acb88b5d5c61645531a21d6d74b9 /ext/mysqli/mysqli_api.c | |
parent | ad210f2c10e07175a39da8ca9b61bd6bf07d6f75 (diff) | |
download | php-git-9d2dda90588cbc9dbf76db30389490cd37d097d9.tar.gz |
Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
-rw-r--r-- | ext/mysqli/mysqli_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 3d651fc204..3ee5c803a5 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1698,7 +1698,7 @@ 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) +#if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND) case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: #endif return IS_LONG; |