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 1/2] 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) From 71edfd70b70935e5d6a7a55a110caa2039a7f13e Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Mon, 2 Dec 2024 20:02:31 +0100 Subject: [PATCH 2/2] Remove incorrect information from INI (#17020) --- php.ini-development | 11 ++++------- php.ini-production | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/php.ini-development b/php.ini-development index d739521a373d7..37619fd071c55 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1158,10 +1158,7 @@ mysqli.allow_persistent = On ; https://php.net/mysqli.max-links mysqli.max_links = -1 -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. +; Default port number for mysqli_connect(). ; https://php.net/mysqli.default-port mysqli.default_port = 3306 @@ -1170,15 +1167,15 @@ mysqli.default_port = 3306 ; https://php.net/mysqli.default-socket mysqli.default_socket = -; Default host for mysqli_connect() (doesn't apply in safe mode). +; Default host for mysqli_connect(). ; https://php.net/mysqli.default-host mysqli.default_host = -; Default user for mysqli_connect() (doesn't apply in safe mode). +; Default user for mysqli_connect(). ; https://php.net/mysqli.default-user mysqli.default_user = -; Default password for mysqli_connect() (doesn't apply in safe mode). +; Default password for mysqli_connect(). ; Note that this is generally a *bad* idea to store passwords in this file. ; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") ; and reveal this password! And of course, any users with read access to this diff --git a/php.ini-production b/php.ini-production index 8e4afb683f9c1..60069f69b8b90 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1160,10 +1160,7 @@ mysqli.allow_persistent = On ; https://php.net/mysqli.max-links mysqli.max_links = -1 -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. +; Default port number for mysqli_connect(). ; https://php.net/mysqli.default-port mysqli.default_port = 3306 @@ -1172,15 +1169,15 @@ mysqli.default_port = 3306 ; https://php.net/mysqli.default-socket mysqli.default_socket = -; Default host for mysqli_connect() (doesn't apply in safe mode). +; Default host for mysqli_connect(). ; https://php.net/mysqli.default-host mysqli.default_host = -; Default user for mysqli_connect() (doesn't apply in safe mode). +; Default user for mysqli_connect(). ; https://php.net/mysqli.default-user mysqli.default_user = -; Default password for mysqli_connect() (doesn't apply in safe mode). +; Default password for mysqli_connect(). ; Note that this is generally a *bad* idea to store passwords in this file. ; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") ; and reveal this password! And of course, any users with read access to this