diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-12-13 02:53:27 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-13 02:53:27 +0400 |
| commit | 6fd8b65cfbd26ec331c5524688cb46aeb23ba4dd (patch) | |
| tree | d4556ac61d6dce051165e700f4679aa7f5ef2b37 | |
| parent | 6b0b4bf8ebec7fa7172d2d2617fa7c80ecf4b528 (diff) | |
| parent | 6e4cfa18f768c385e1945fcb4776cf6ad0cecdfc (diff) | |
| download | php-git-6fd8b65cfbd26ec331c5524688cb46aeb23ba4dd.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Really fix test pdo_mysql_class_constants.phpt
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt index e52e4b54e7..ee0f12358d 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt @@ -3,6 +3,11 @@ PDO MySQL specific class constants --SKIPIF-- <?php require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); +if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) { + /* Need connection to detect library version */ + require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); + MySQLPDOTest::skip(); +} ?> --FILE-- <?php @@ -29,9 +34,13 @@ 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") || mysqli_get_client_version() > 50605) - || MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 50605) { + if (extension_loaded('mysqlnd')) { + $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; + } else if (extension_loaded('mysqli')) { + if (mysqli_get_client_version() > 50605) { + $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; + } + } else if (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. */ |