Message can vary depending on server version

diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt
index 38bc46b84c717bd425fbf4204c34090027ed1861..6f45777978190993df168f158e259f27301479d6 100644 (file)
--- 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 036253a0b1eec497c7f872ff62969b0a56a1a6ed..a1e9983bf337cd0172704032b7c4c63c2ac856e5 100644 (file)
--- 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