php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix mysql tests with non-standard server port
This commit is contained in:
Ilija Tovilo
2023-04-20 08:46:01 +02:00
parent b22758d764 72fc8b51a4
commit 4af95b7c58
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/mysqli/tests/bug73462.phpt
View File

@@ -11,14 +11,14 @@ require_once('skipifconnectfailure.inc');
require_once("connect.inc");
/* Initial persistent connection */
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db);
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
$result = $mysql_1->query("SHOW STATUS LIKE 'Connections'");
$c1 = $result->fetch_row();
$result->free();
$mysql_1->close();
/* Failed connection to invalid host */
$mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db);
$mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db, $port);
try {
$mysql_2->close();
} catch (Error $exception) {
@@ -26,7 +26,7 @@ require_once('skipifconnectfailure.inc');
}
/* Re-use persistent connection */
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db);
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
$error = mysqli_connect_errno();
$result = $mysql_3->query("SHOW STATUS LIKE 'Connections'");
$c3 = $result->fetch_row();

2
ext/mysqli/tests/bug73949.phpt
View File

@@ -14,7 +14,7 @@ class cc{
function __construct($c=null){
}
};
$i=mysqli_connect('p:'.$host, $user, $passwd, $db);
$i=mysqli_connect('p:'.$host, $user, $passwd, $db, $port);
$res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'");
$t=array(new stdClass);
while($db= mysqli_fetch_object($res,'cc',$t)){}