mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix some MariaDB test failures
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user