From: Ulf Wendel <uw@php.net>
Date: Fri, 29 May 2009 13:36:54 +0000 (+0000)
Subject: Fixing tests - messages/warnings can vary by version
X-Git-Tag: php-5.4.0alpha1~191^2~3447
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e92bf65c4cff50cf4755b5bc31e62ce4e06151f7;p=php

Fixing tests - messages/warnings can vary by version
---

diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc
index fcbf45a2e7..04d6e8a12a 100644
--- a/ext/mysqli/tests/local_infile_tools.inc
+++ b/ext/mysqli/tests/local_infile_tools.inc
@@ -58,7 +58,7 @@
 			return false;
 		}
 
-		if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
+		if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s'
 			INTO TABLE test
 			FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
 			LINES TERMINATED BY '\n'",
diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
index 4cbdf20ff6..b876389f18 100644
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt
@@ -170,7 +170,7 @@ Callback: 0
 Callback: 1
 Callback set to 'callback_fclose'
 Callback: 0
-[022] LOAD DATA failed, [2000] File handle closed in handler
+[022] LOAD DATA failed, [2000] File handle close%s
 Callback set to 'callback_invalid_args'
 Callback: 0
 Callback: 1