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.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Fix flaky connection count in mysqli test
This commit is contained in:
Ilija Tovilo 2025-03-13 16:46:03 +01:00
commit f390425db3
No known key found for this signature in database
GPG key ID: 886A57EEE4DC754B
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/mysqli/tests/bug73462.phpt
View file

@ -5,13 +5,6 @@ mysqli
--SKIPIF-- --SKIPIF--
<?php <?php
require_once('skipifconnectfailure.inc'); require_once('skipifconnectfailure.inc');
/*
* TODO: this test is flaky with persistent connections on PPC CI runner
* [001] Expected '8711' got '8712'.
*/
if (gethostname() == "php-ci-ppc64be") {
die("SKIP test is flaky");
}
?> ?>
--FILE-- --FILE--
<?php <?php
@ -19,7 +12,7 @@ if (gethostname() == "php-ci-ppc64be") {
/* Initial persistent connection */ /* Initial persistent connection */
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db, $port); $mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
$result = $mysql_1->query("SHOW STATUS LIKE 'Connections'"); $result = $mysql_1->query("SELECT CONNECTION_ID()");
$c1 = $result->fetch_row(); $c1 = $result->fetch_row();
$result->free(); $result->free();
$mysql_1->close(); $mysql_1->close();
@ -35,7 +28,7 @@ if (gethostname() == "php-ci-ppc64be") {
/* Re-use persistent connection */ /* Re-use persistent connection */
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db, $port); $mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
$error = mysqli_connect_errno(); $error = mysqli_connect_errno();
$result = $mysql_3->query("SHOW STATUS LIKE 'Connections'"); $result = $mysql_3->query("SELECT CONNECTION_ID()");
$c3 = $result->fetch_row(); $c3 = $result->fetch_row();
$result->free(); $result->free();
$mysql_3->close(); $mysql_3->close();