diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-04 18:40:06 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-04 18:40:06 +0400 |
| commit | 217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299 (patch) | |
| tree | 83093666c427b4770d82c0ff44f0d7034bec13a8 /libmysqld/emb_qcache.cc | |
| parent | d6ed077fc82c2f4d20895db9a6b16ca295f23c33 (diff) | |
| parent | 28d4cf0c1b3366c6471866d144ef28fced1e5390 (diff) | |
| download | mariadb-git-217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'libmysqld/emb_qcache.cc')
| -rw-r--r-- | libmysqld/emb_qcache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index 74a6337912a..4694a94b133 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -418,7 +418,7 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src) if (!data) goto err; - init_alloc_root(&data->alloc, 8192,0,MYF(0)); + init_alloc_root(&data->alloc, "embedded_query_cache", 8192,0,MYF(0)); f_alloc= &data->alloc; data->fields= src->load_int(); |