MFH - 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 fcbf45a2e76926d01bd910eb1b4d6c7b6b39e128..04d6e8a12a5056e9b4cc6d4822250685f9810236 100644 (file)
--- 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 4cbdf20ff69ee43599985b796b8dfd0597eaec74..b876389f18bc1a634e8a0f0eb88d16e9c8f7d474 100644 (file)
--- 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