--- embedaddon/php/ext/mysqli/tests/mysqli_constants.phpt	2012/02/21 23:47:58	1.1
+++ embedaddon/php/ext/mysqli/tests/mysqli_constants.phpt	2013/07/22 01:31:56	1.1.1.2
@@ -176,6 +176,10 @@ require_once('skipifconnectfailure.inc');
 		}
 	}
 
+	if (($IS_MYSQLND && version_compare(PHP_VERSION, ' 5.4.12-dev', '>=')) || (!$IS_MYSQLND && ($version > 50610))) {
+		/* could be that MySQL/libmysql 5.6.9 had the flag already but it was no stable release */
+		$expected_constants["MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
+	}
 
 	$unexpected_constants = array();