database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Remove out-of date code

Browse Source 
gbh != NULL is handled in a separate branch above,
we don't get into this part of code when gbh!=NULL
This commit is contained in:
Sergei Petrunia
2016-03-27 12:07:02 +03:00
parent 0786b0d2cd
commit c95e789e63
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@ -2278,22 +2278,14 @@ bool JOIN::make_aggr_tables_info()
tmp_table_param.hidden_field_count= tmp_table_param.hidden_field_count=
all_fields.elements - fields_list.elements; all_fields.elements - fields_list.elements;
if (!gbh) distinct= select_distinct && !group_list;
{ keep_row_order= false;
distinct= select_distinct && !group_list;
keep_row_order= false;
}
if (create_postjoin_aggr_table(curr_tab, if (create_postjoin_aggr_table(curr_tab,
&all_fields, tmp_group, &all_fields, tmp_group,
group_list && simple_group, group_list && simple_group,
distinct, keep_row_order)) distinct, keep_row_order))
DBUG_RETURN(true); DBUG_RETURN(true);
exec_tmp_table= curr_tab->table; exec_tmp_table= curr_tab->table;
if (gbh)
{
/* Give storage engine access to temporary table */
gbh->table= exec_tmp_table;
}
if (exec_tmp_table->distinct) if (exec_tmp_table->distinct)
optimize_distinct(); optimize_distinct();