Commit c95e789e authored by Sergei Petrunia's avatar Sergei Petrunia

Remove out-of date code

gbh != NULL is handled in a separate branch above,
we don't get into this part of code when gbh!=NULL
parent 0786b0d2
......@@ -2278,22 +2278,14 @@ bool JOIN::make_aggr_tables_info()
tmp_table_param.hidden_field_count=
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,
&all_fields, tmp_group,
group_list && simple_group,
distinct, keep_row_order))
DBUG_RETURN(true);
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)
optimize_distinct();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment