archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix some MariaDB test failures
This commit is contained in:
Niels Dossche 2024-12-02 19:22:27 +01:00
commit e36dea065d
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mysqli/tests/063.phpt
View file

@ -29,6 +29,6 @@ require_once 'skipifconnectfailure.inc';
$mysql->close(); $mysql->close();
?> ?>
--EXPECT-- --EXPECTF--
string(3) "foo" string(3) "foo"
Unknown column 'invalid' in 'field list' Unknown column 'invalid' in '%r(SELECT|field list)%r'

2
ext/mysqli/tests/bug71863.phpt
View file

@ -30,4 +30,4 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bug_71863"))
mysqli_close($link); mysqli_close($link);
?> ?>
--EXPECTF-- --EXPECTF--
%AUnknown column 'owner_id' in 'where clause' %AUnknown column 'owner_id' in '%r(WHERE|where clause)%r'

4
ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
View file

@ -65,7 +65,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change"))
mysqli_close($link); mysqli_close($link);
?> ?>
--EXPECT-- --EXPECTF--
bool(true) bool(true)
bool(true) bool(true)
---- Row 1 ---- Row 1
@ -80,7 +80,7 @@ NULL
ALTER ALTER
bool(true) bool(true)
bool(false) bool(false)
string(34) "Unknown column 'a' in 'field list'" string(%d) "Unknown column 'a' in '%r(SELECT|field list)%r'"
---- Row 1 ---- Row 1
bool(false) bool(false)
int(2) int(2)