summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2012-12-03 15:32:52 +0100
committerRemi Collet <remi@php.net>2012-12-03 15:32:52 +0100
commit784850211ed9e0bd50c2dac6e26746c0e9a347b7 (patch)
tree6a935ba9878983a543af4c8a87e2cff8c5067276 /ext/pdo_mysql
parent17dd769ab0362fdf150b39a18fab12414ba490d8 (diff)
downloadphp-git-784850211ed9e0bd50c2dac6e26746c0e9a347b7.tar.gz
Reduce case where this test will fails:
- no connection AND no mysqli extension So, will succeed when no configured connection, but mysqli available.
Diffstat (limited to 'ext/pdo_mysql')
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
index 2545307cfb..e52e4b54e7 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
@@ -29,7 +29,8 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
$expected['MYSQL_ATTR_READ_DEFAULT_GROUP'] = true;
}
- if (extension_loaded('mysqli') && stristr(mysqli_get_client_info(), "mysqlnd")
+ if (extension_loaded('mysqli')
+ && (stristr(mysqli_get_client_info(), "mysqlnd") || mysqli_get_client_version() > 50605)
|| MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 50605) {
/* XXX the MySQL client library version isn't exposed with any
constants, the single possibility is to use the PDO::getAttribute().