svn: /php/php-src/ branches/PHP_5_3/ext/mysql/tests/mysql_constants.phpt trunk/ext/mysql/tests/mysql_constants.phpt
| From: | Ulf Wendel | Date: | Fri, 18 Jun 2010 09:56:18 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/mysql/tests/mysql_constants.phpt trunk/ext/mysql/tests/mysql_constants.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62924@lists.php.net to get a copy of this message | ||
uw Fri, 18 Jun 2010 09:56:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300565
Log:
Don't bail if there is another extension that exports constants starting with
mysql<something>
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_constants.phpt
U php/php-src/trunk/ext/mysql/tests/mysql_constants.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_constants.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_constants.phpt 2010-06-18 08:22:14 UTC (rev
300564)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_constants.phpt 2010-06-18 09:56:18 UTC (rev
300565)
@@ -38,7 +38,7 @@
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]);
Modified: php/php-src/trunk/ext/mysql/tests/mysql_constants.phpt
===================================================================
--- php/php-src/trunk/ext/mysql/tests/mysql_constants.phpt 2010-06-18 08:22:14 UTC (rev 300564)
+++ php/php-src/trunk/ext/mysql/tests/mysql_constants.phpt 2010-06-18 09:56:18 UTC (rev 300565)
@@ -38,7 +38,7 @@
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]);