summaryrefslogtreecommitdiff
path: root/sql/sql_servers.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2020-04-04 15:52:31 +0400
committerSergey Vojtovich <svoj@mariadb.org>2020-04-04 15:52:31 +0400
commit40c2cf335d8397ef4284a77b680af763de4c7364 (patch)
tree6eb6726cd8866c1ddb5d0ce7e5ecb43c9df46b17 /sql/sql_servers.cc
parent2e2138baa5e1a5c9051348f96454c0e40f88e889 (diff)
downloadmariadb-git-40c2cf335d8397ef4284a77b680af763de4c7364.tar.gz
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.
Diffstat (limited to 'sql/sql_servers.cc')
-rw-r--r--sql/sql_servers.cc4
1 files changed, 3 insertions, 1 deletions
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: