summaryrefslogtreecommitdiff
path: root/ext/mysql
diff options
context:
space:
mode:
authorUlf Wendel <uw@php.net>2010-06-18 09:56:18 +0000
committerUlf Wendel <uw@php.net>2010-06-18 09:56:18 +0000
commitf3448471dfdd1ce7f40772ada33fa5cce629ad71 (patch)
tree2465d5d7e2185c1867608d87c0cdcafaf6bad112 /ext/mysql
parentd52e13220338e74e4b6c50e413e876aa66df8a4b (diff)
downloadphp-git-f3448471dfdd1ce7f40772ada33fa5cce629ad71.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 e88e6556f8..1346100209 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]);