summaryrefslogtreecommitdiff
path: root/sql/table_cache.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2018-02-04 18:40:06 +0400
committerAlexander Barkov <bar@mariadb.org>2018-02-04 18:40:06 +0400
commit217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299 (patch)
tree83093666c427b4770d82c0ff44f0d7034bec13a8 /sql/table_cache.cc
parentd6ed077fc82c2f4d20895db9a6b16ca295f23c33 (diff)
parent28d4cf0c1b3366c6471866d144ef28fced1e5390 (diff)
downloadmariadb-git-217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299.tar.gz
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/table_cache.cc')
-rw-r--r--sql/table_cache.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table_cache.cc b/sql/table_cache.cc
index ba7047773b9..5ca4dd9f175 100644
--- a/sql/table_cache.cc
+++ b/sql/table_cache.cc
@@ -1301,7 +1301,8 @@ int tdc_iterate(THD *thd, my_hash_walk_action action, void *argument,
if (no_dups)
{
- init_alloc_root(&no_dups_argument.root, 4096, 4096, MYF(alloc_flags));
+ init_alloc_root(&no_dups_argument.root, "no_dups", 4096, 4096,
+ MYF(alloc_flags));
my_hash_init(&no_dups_argument.hash, &my_charset_bin, tdc_records(), 0, 0,
eliminate_duplicates_get_key, 0, hash_flags);
no_dups_argument.action= action;