diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 19:14:48 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 19:14:48 +0100 |
| commit | d430b5a4eb26679a6dfa7055dff43cae8dabd20e (patch) | |
| tree | 6a07c27c7985c2ab2c3c845387352faf759a6ca9 | |
| parent | 258c76eb41a7eaf8e1e7b4994fa5f268c2060039 (diff) | |
| download | php-git-d430b5a4eb26679a6dfa7055dff43cae8dabd20e.tar.gz | |
Add mysqli support - constants and checking in mysqli_options() for the
new constant for password expriration
| -rw-r--r-- | ext/mysqli/mysqli.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 1a7d72feae..a4c1b874fd 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -838,6 +838,9 @@ PHP_MINIT_FUNCTION(mysqli) REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_BACKUP_LOG", REFRESH_BACKUP_LOG, CONST_CS | CONST_PERSISTENT); #endif +#if MYSQL_VERSION_ID >= 50611 || defined(MYSQLI_USE_MYSQLND) + REGISTER_LONG_CONSTANT("MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT); +#endif #ifdef MYSQLI_USE_MYSQLND mysqlnd_reverse_api_register_api(&mysqli_reverse_api TSRMLS_CC); diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 277322f1ca..2cda0aa903 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1672,6 +1672,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 |