From 9dae991a95729c4a20498b35d6d42cbb6e0c3e79 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri, 30 Aug 2019 17:06:53 +0200
Subject: [PATCH] MDEV-19200 Do not print "Thread <num> did not exit" message
 for system/background THDs

---
 sql/mysqld.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 63d1d07cfaa..fc7e82936ea 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1592,7 +1592,7 @@ static my_bool kill_thread_phase_2(THD *thd, void *)
 /* associated with the kill thread phase 1 */
 static my_bool warn_threads_active_after_phase_1(THD *thd, void *)
 {
-  if (!thd->is_binlog_dump_thread())
+  if (!thd->is_binlog_dump_thread() && thd->vio_ok())
     sql_print_warning("%s: Thread %llu (user : '%s') did not exit\n", my_progname,
                       (ulonglong) thd->thread_id,
                       (thd->main_security_ctx.user ?