--- embedaddon/php/ext/mysqli/mysqli_api.c 2012/05/29 12:34:41 1.1.1.2 +++ embedaddon/php/ext/mysqli/mysqli_api.c 2013/07/22 01:31:55 1.1.1.3 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ | Ulf Wendel | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.1.1.2 2012/05/29 12:34:41 misho Exp $ + $Id: mysqli_api.c,v 1.1.1.3 2013/07/22 01:31:55 misho Exp $ */ #ifdef HAVE_CONFIG_H @@ -1672,6 +1672,9 @@ static int mysqli_options_get_option_zval_type(int opt #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