From: Ulf Wendel <uw@php.net>
Date: Wed, 23 Nov 2011 16:38:50 +0000 (+0000)
Subject: Message can vary depending on server version
X-Git-Tag: php-5.5.0alpha1~828
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=785b68a109a8f47aaa87cfc5fa396b5f34bb5847;p=php

Message can vary depending on server version
---

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