From 40c2cf335d8397ef4284a77b680af763de4c7364 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Sat, 4 Apr 2020 15:52:31 +0400
Subject: [PATCH] MDEV-22146 - Server crashes in mysql_ha_flush_tables upon
 ALTER SERVER

Regression after bfdd30d. Initialize addition TABLE_LIST members which
are used by subsequent close_cached_tables() call.
---
 sql/sql_servers.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc
index 77b7c64422c..d52d6071e89 100644
--- a/sql/sql_servers.cc
+++ b/sql/sql_servers.cc
@@ -164,7 +164,9 @@ static my_bool close_cached_connection_tables_callback(
     return TRUE;
   }
 
-  tmp->next_local= arg->tables;
+  tmp->next_global= tmp->next_local= arg->tables;
+  MDL_REQUEST_INIT(&tmp->mdl_request, MDL_key::TABLE, tmp->db.str,
+                   tmp->table_name.str, MDL_EXCLUSIVE, MDL_TRANSACTION);
   arg->tables= tmp;
 
 end: