mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: specify memroot explicitly in new Explain_xxx

Browse source
This commit is contained in:
Sergei Golubchik 2018-05-19 09:06:04 +02:00
commit 6f530c63cd
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_select.cc
View file

@ -24771,7 +24771,7 @@ void save_agg_explain_data(JOIN *join, Explain_select *xpl_sel)
{ {
// Each aggregate means a temp.table // Each aggregate means a temp.table
prev_node= node; prev_node= node;
node= new Explain_aggr_tmp_table; node= new (thd->mem_root) Explain_aggr_tmp_table;
node->child= prev_node; node->child= prev_node;
if (join_tab->window_funcs_step) if (join_tab->window_funcs_step)
@ -24791,14 +24791,14 @@ void save_agg_explain_data(JOIN *join, Explain_select *xpl_sel)
if (join_tab->distinct) if (join_tab->distinct)
{ {
prev_node= node; prev_node= node;
node= new Explain_aggr_remove_dups; node= new (thd->mem_root) Explain_aggr_remove_dups;
node->child= prev_node; node->child= prev_node;
} }
if (join_tab->filesort) if (join_tab->filesort)
{ {
Explain_aggr_filesort *eaf = Explain_aggr_filesort *eaf =
new Explain_aggr_filesort(thd->mem_root, is_analyze, join_tab->filesort); new (thd->mem_root) Explain_aggr_filesort(thd->mem_root, is_analyze, join_tab->filesort);
prev_node= node; prev_node= node;
node= eaf; node= eaf;
node->child= prev_node; node->child= prev_node;