diff options
| author | Ulf Wendel <uw@php.net> | 2011-11-23 16:38:50 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2011-11-23 16:38:50 +0000 |
| commit | 785b68a109a8f47aaa87cfc5fa396b5f34bb5847 (patch) | |
| tree | 7f1e4da276b3e92371060a9f8b2721166ac353c9 | |
| parent | b3522ffdcb738a2f27b042008351c67dc7965ba8 (diff) | |
| download | php-git-785b68a109a8f47aaa87cfc5fa396b5f34bb5847.tar.gz | |
Message can vary depending on server version
| -rw-r--r-- | ext/mysqli/tests/071.phpt | 6 | ||||
| -rw-r--r-- | ext/mysqli/tests/072.phpt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index 38bc46b84c..6f45777978 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -22,14 +22,14 @@ require_once('skipifconnectfailure.inc'); } } 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 @@ require_once('skipifconnectfailure.inc'); } } 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); diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index 036253a0b1..a1e9983bf3 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -27,6 +27,6 @@ require_once('skipifconnectfailure.inc'); --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 |