From a3196b3f72294b7eae3d342db70384d8db482bea Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 17 Aug 2024 17:45:07 +0200
Subject: [PATCH] Drop support for MYSQL_TEST_SKIP_CONNECT_FAILURE (#15461)

Closes GH-15457.
---
 ext/mysqli/tests/connect.inc              |  1 -
 ext/mysqli/tests/skipifconnectfailure.inc | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index 18e4902624e..3a7d578e977 100644
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -16,7 +16,6 @@
     $db        = getenv("MYSQL_TEST_DB")       ?: "test";
     $engine    = getenv("MYSQL_TEST_ENGINE")   ?: "InnoDB";
     $socket    = getenv("MYSQL_TEST_SOCKET")   ?: null;
-    $skip_on_connect_failure  = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ?: true;
     if ($socket) {
         ini_set('mysqli.default_socket', $socket);
     }
diff --git a/ext/mysqli/tests/skipifconnectfailure.inc b/ext/mysqli/tests/skipifconnectfailure.inc
index 2e770426d4c..986f646f8bb 100644
--- a/ext/mysqli/tests/skipifconnectfailure.inc
+++ b/ext/mysqli/tests/skipifconnectfailure.inc
@@ -1,9 +1,7 @@
 <?php
 require_once 'connect.inc';
-if ($skip_on_connect_failure) {
-    $link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-    if (!is_object($link))
-        die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
-    mysqli_close($link);
-}
+$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!is_object($link))
+    die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+mysqli_close($link);
 ?>