clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Reduce case where this test will fails: - no connection AND no mysqli extension
This commit is contained in:
Remi Collet 2012-12-03 15:35:15 +01:00
commit 65973c240e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
View File

@ -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().