uw Wed, 23 Nov 2011 16:38:50 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319717
Log: Message can vary depending on server version Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/072.phpt U php/php-src/branches/PHP_5_4/ext/mysqli/tests/071.phpt U php/php-src/branches/PHP_5_4/ext/mysqli/tests/072.phpt U php/php-src/trunk/ext/mysqli/tests/071.phpt U php/php-src/trunk/ext/mysqli/tests/072.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt 2011-11-23 15:29:11 UTC (rev 319716) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt 2011-11-23 16:38:50 UTC (rev 319717) @@ -22,14 +22,14 @@ } } else { /* libmysql return value seems to depend on server version */ - if (($version >= 50123 || $version <= 40200) && $version != 50200) { + if ((($version >= 50123) || ($version <= 40200)) && $version != 50200) { /* TODO: find exact version */ if ($ret !== true){ printf("[001] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); } } else { if ($ret !== false){ - printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); } } } @@ -49,7 +49,7 @@ } } else { /* libmysql return value seems to depend on server version */ - if (($version >= 50123 || $version <= 40200) && $version != 50200) { + if ((($version >= 50123) || ($version <= 40200)) && $version != 50200) { /* TODO: find exact version */ if ($ret !== true){ printf("[002] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/072.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/072.phpt 2011-11-23 15:29:11 UTC (rev 319716) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/072.phpt 2011-11-23 16:38:50 UTC (rev 319717) @@ -27,6 +27,6 @@ --EXPECTF-- int(1) int(1051) -%unicode|string%(26) "Unknown table 'not_exists'" +%unicode|string%(%d) "Unknown table %snot_exists%s" %unicode|string%(5) "HY000" done! \ No newline at end of file Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/071.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/tests/071.phpt 2011-11-23 15:29:11 UTC (rev 319716) +++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/071.phpt 2011-11-23 16:38:50 UTC (rev 319717) @@ -22,14 +22,14 @@ } } else { /* libmysql return value seems to depend on server version */ - if (($version >= 50123 || $version <= 40200) && $version != 50200) { + if ((($version >= 50123) || ($version <= 40200)) && $version != 50200) { /* TODO: find exact version */ if ($ret !== true){ printf("[001] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); } } else { if ($ret !== false){ - printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); } } } @@ -49,7 +49,7 @@ } } else { /* libmysql return value seems to depend on server version */ - if (($version >= 50123 || $version <= 40200) && $version != 50200) { + if ((($version >= 50123) || ($version <= 40200)) && $version != 50200) { /* TODO: find exact version */ if ($ret !== true){ printf("[002] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/072.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/tests/072.phpt 2011-11-23 15:29:11 UTC (rev 319716) +++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/072.phpt 2011-11-23 16:38:50 UTC (rev 319717) @@ -27,6 +27,6 @@ --EXPECTF-- int(1) int(1051) -%unicode|string%(26) "Unknown table 'not_exists'" +%unicode|string%(%d) "Unknown table %snot_exists%s" %unicode|string%(5) "HY000" done! \ No newline at end of file Modified: php/php-src/trunk/ext/mysqli/tests/071.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/071.phpt 2011-11-23 15:29:11 UTC (rev 319716) +++ php/php-src/trunk/ext/mysqli/tests/071.phpt 2011-11-23 16:38:50 UTC (rev 319717) @@ -22,14 +22,14 @@ } } else { /* libmysql return value seems to depend on server version */ - if (($version >= 50123 || $version <= 40200) && $version != 50200) { + if ((($version >= 50123) || ($version <= 40200)) && $version != 50200) { /* TODO: find exact version */ if ($ret !== true){ printf("[001] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); } } else { if ($ret !== false){ - printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); + printf("[001] Expecting boolean/false got %s/%s @\n", gettype($ret), var_export($ret, true), $version); } } } @@ -49,7 +49,7 @@ } } else { /* libmysql return value seems to depend on server version */ - if (($version >= 50123 || $version <= 40200) && $version != 50200) { + if ((($version >= 50123) || ($version <= 40200)) && $version != 50200) { /* TODO: find exact version */ if ($ret !== true){ printf("[002] Expecting boolean/true got %s/%s @\n", gettype($ret), var_export($ret, true), $version); Modified: php/php-src/trunk/ext/mysqli/tests/072.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/072.phpt 2011-11-23 15:29:11 UTC (rev 319716) +++ php/php-src/trunk/ext/mysqli/tests/072.phpt 2011-11-23 16:38:50 UTC (rev 319717) @@ -27,6 +27,6 @@ --EXPECTF-- int(1) int(1051) -%unicode|string%(26) "Unknown table 'not_exists'" +%unicode|string%(%d) "Unknown table %snot_exists%s" %unicode|string%(5) "HY000" done! \ No newline at end of file
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php