summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-11-14 21:18:16 +0100
committerAnatoliy Belsky <ab@php.net>2012-11-14 21:18:16 +0100
commitf85ae48f4f06af3cf20e96e51cf7a86afcd3670f (patch)
treeba7ece3b2c8fbe5bb04ab6037969f4189d5c8cd7 /ext/pdo_mysql
parent01f189419429bb84b298dd9630fa9a63b67fe041 (diff)
downloadphp-git-f85ae48f4f06af3cf20e96e51cf7a86afcd3670f.tar.gz
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
There is a constant now which only is there when mysqli with mysqlnd and pdo_mysql was compiled at the same time, or when libmysql version > 50605. So checking for that dynamically, will fail only if there is no mysqli and no connection.
Diffstat (limited to 'ext/pdo_mysql')
-rw-r--r--ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt8
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
index 17fa5d6059..2545307cfb 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
@@ -29,6 +29,14 @@ 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")
+ || 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().
+ This however will fail with no connection. */
+ $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true;
+ }
+
/*
TODO