summaryrefslogtreecommitdiff
path: root/ext/mysql
diff options
context:
space:
mode:
authorUlf Wendel <uw@php.net>2010-06-18 09:56:18 (GMT)
committerUlf Wendel <uw@php.net>2010-06-18 09:56:18 (GMT)
commitc71d35120c9bc906643f49cd55320f4be62bffb3 (patch)
tree15e47b9d32015a82cb35a56b9ead7b43fa720b54 /ext/mysql
parentaac1ef381591f306959e83a514efa277fd8cf534 (diff)
downloadphp-c71d35120c9bc906643f49cd55320f4be62bffb3.tar.gz
Don't bail if there is another extension that exports constants starting with mysql<something>
Diffstat (limited to 'ext/mysql')
-rw-r--r--ext/mysql/tests/mysql_constants.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/tests/mysql_constants.phpt b/ext/mysql/tests/mysql_constants.phpt
index e88e655..1346100 100644
--- a/ext/mysql/tests/mysql_constants.phpt
+++ b/ext/mysql/tests/mysql_constants.phpt
@@ -38,7 +38,7 @@ $unexpected_constants = array();
foreach ($constants as $group => $consts) {
foreach ($consts as $name => $value) {
- if (stristr($name, 'mysql') && !stristr($name, 'mysqli')) {
+ if (stristr($name, 'mysql') && !preg_match("/^mysql([^_]+)_/iu", $name)) {
$name = strtoupper($name);
if (isset($expected_constants[$name])) {
unset($expected_constants[$name]);