From d881f51debdfcd2e5f9a0e90a7eaf719e52a5db0 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 24 Apr 2025 22:31:03 +0200 Subject: [PATCH] MySQL: Fix connecting with port (fix #1057, regression from 5.1.1) --- CHANGELOG.md | 1 + adminer/drivers/mysql.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e4ffacd..a884b5c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fix type error in Create function (bug #1053) - MySQL: Avoid warning on selecting tables with fulltext indexes (bug #1036) - MySQL, PostgreSQL: Support index algorithms (bug #1030) +- MySQL: Fix connecting with port (bug #1057, regression from 5.1.1) - PostgreSQL, CockroachDB: Creating partitioned tables (bug #1031) - PostgreSQL: Move partitioned tables from table list to parent table - PostgreSQL: Support partial indices (bug #1048) diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index cd82724f..6b5dfe68 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -29,7 +29,7 @@ if (!defined('Adminer\DRIVER')) { ($server . $username . $password != "" ? $password : ini_get("mysqli.default_pw")), null, (is_numeric($port) ? intval($port) : ini_get("mysqli.default_port")), - (is_numeric($port) ? $port : null), + (is_numeric($port) ? null : $port), ($ssl ? ($ssl['verify'] !== false ? 2048 : 64) : 0) // 2048 - MYSQLI_CLIENT_SSL, 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16) ); $this->options(MYSQLI_OPT_LOCAL_INFILE, false);