From 95c38e488f4e912ddecd50056522d11d4e0977a3 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 1 Dec 2022 15:47:55 +1100 Subject: [PATCH] Fix mysqli test wrt. MariaDB The test results under MariaDB, except they report "MariaDB" instead of MySQL. --- ext/mysqli/tests/mysqli_execute_query.phpt | 2 +- ext/mysqli/tests/mysqli_reap_async_query_error.phpt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/mysqli/tests/mysqli_execute_query.phpt b/ext/mysqli/tests/mysqli_execute_query.phpt index 64b7fbcf3e770..0cb5c29f72766 100644 --- a/ext/mysqli/tests/mysqli_execute_query.phpt +++ b/ext/mysqli/tests/mysqli_execute_query.phpt @@ -89,7 +89,7 @@ print "done!"; require_once "clean_table.inc"; ?> --EXPECTF-- -[005] [1064] You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'some random gibberish' at line 1 +[005] [1064] You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'some random gibberish' at line 1 [006] [1062] Duplicate entry '1' for key '%s' [009] mysqli::execute_query(): Argument #2 ($params) must consist of exactly 3 elements, 2 present [010] mysqli::execute_query(): Argument #2 ($params) must be a list array diff --git a/ext/mysqli/tests/mysqli_reap_async_query_error.phpt b/ext/mysqli/tests/mysqli_reap_async_query_error.phpt index d5672ba177649..e7a48eaf1a38f 100644 --- a/ext/mysqli/tests/mysqli_reap_async_query_error.phpt +++ b/ext/mysqli/tests/mysqli_reap_async_query_error.phpt @@ -26,6 +26,6 @@ try { print "done!"; ?> ---EXPECT-- -You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1 +--EXPECTF-- +You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near ')' at line 1 done!