From: Andrey Hristov <andrey@php.net>
Date: Wed, 9 Jan 2013 18:14:48 +0000 (+0100)
Subject: Add mysqli support - constants and checking in mysqli_options() for the
X-Git-Tag: php-5.5.0alpha4~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d430b5a4eb26679a6dfa7055dff43cae8dabd20e;p=php

Add mysqli support - constants and checking in mysqli_options() for the
new constant for password expriration
---

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