From f4b900e6fa28b9439e7453d6bbc4570aa5ed0ef5 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 5 Jan 2023 12:21:20 +1100 Subject: MDEV-24301 [Warning] Aborted connection (This connection closed normally) Warning on a normal graceful disconnnect is excessive, so lets not do it. MDEV-19282 restructed the code from 10.3 so applying this as a 10.4+ fix. --- sql/mysqld.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sql') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9203743adfe..1fd69583ee4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2576,11 +2576,9 @@ void close_connection(THD *thd, uint sql_errno) net_send_error(thd, sql_errno, ER_DEFAULT(sql_errno), NULL); thd->print_aborted_warning(lvl, ER_DEFAULT(sql_errno)); } - else - thd->print_aborted_warning(lvl, (thd->main_security_ctx.user ? - "This connection closed normally" : - "This connection closed normally without" - " authentication")); + else if (!thd->main_security_ctx.user) + thd->print_aborted_warning(lvl, "This connection closed normally without" + " authentication"); thd->disconnect(); -- cgit v1.2.1