Skip to content

Commit 1a6f8a0

Browse files
committed
Fix some MariaDB test failures
Allow other wording too such that these mysqli tests pass. Closes GH-17004.
1 parent 73ebc92 commit 1a6f8a0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ext/mysqli/tests/063.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ require_once('skipifconnectfailure.inc');
2929

3030
$mysql->close();
3131
?>
32-
--EXPECT--
32+
--EXPECTF--
3333
string(3) "foo"
34-
Unknown column 'invalid' in 'field list'
34+
Unknown column 'invalid' in '%r(SELECT|field list)%r'

ext/mysqli/tests/bug71863.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bug_71863"))
3030
mysqli_close($link);
3131
?>
3232
--EXPECTF--
33-
%AUnknown column 'owner_id' in 'where clause'
33+
%AUnknown column 'owner_id' in '%r(WHERE|where clause)%r'

ext/mysqli/tests/mysqli_stmt_datatype_change.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change"))
6565

6666
mysqli_close($link);
6767
?>
68-
--EXPECT--
68+
--EXPECTF--
6969
bool(true)
7070
bool(true)
7171
---- Row 1
@@ -80,7 +80,7 @@ NULL
8080
ALTER
8181
bool(true)
8282
bool(false)
83-
string(34) "Unknown column 'a' in 'field list'"
83+
string(%d) "Unknown column 'a' in '%r(SELECT|field list)%r'"
8484
---- Row 1
8585
bool(false)
8686
int(2)

0 commit comments

Comments
 (0)