From 1a6f8a0b79cea1019b12fc42d96a45a55fe01385 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sat, 30 Nov 2024 19:16:51 +0100
Subject: [PATCH] Fix some MariaDB test failures

Allow other wording too such that these mysqli tests pass.

Closes GH-17004.
---
 ext/mysqli/tests/063.phpt                         | 4 ++--
 ext/mysqli/tests/bug71863.phpt                    | 2 +-
 ext/mysqli/tests/mysqli_stmt_datatype_change.phpt | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt
index 32166b287df36..a0a657de002e6 100644
--- a/ext/mysqli/tests/063.phpt
+++ b/ext/mysqli/tests/063.phpt
@@ -29,6 +29,6 @@ require_once('skipifconnectfailure.inc');
 
     $mysql->close();
 ?>
---EXPECT--
+--EXPECTF--
 string(3) "foo"
-Unknown column 'invalid' in 'field list'
+Unknown column 'invalid' in '%r(SELECT|field list)%r'
diff --git a/ext/mysqli/tests/bug71863.phpt b/ext/mysqli/tests/bug71863.phpt
index 6b8f66b42a5d5..ef6e5130271af 100644
--- a/ext/mysqli/tests/bug71863.phpt
+++ b/ext/mysqli/tests/bug71863.phpt
@@ -30,4 +30,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bug_71863"))
 mysqli_close($link);
 ?>
 --EXPECTF--
-%AUnknown column 'owner_id' in 'where clause'
+%AUnknown column 'owner_id' in '%r(WHERE|where clause)%r'
diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
index 3ab05504bbef4..ebf5073176317 100644
--- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -65,7 +65,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change"))
 
 mysqli_close($link);
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
 ---- Row 1
@@ -80,7 +80,7 @@ NULL
 ALTER
 bool(true)
 bool(false)
-string(34) "Unknown column 'a' in 'field list'"
+string(%d) "Unknown column 'a' in '%r(SELECT|field list)%r'"
 ---- Row 1
 bool(false)
 int(2)