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

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

This commit is contained in:
Alexander Barkov
2018-01-23 17:43:12 +04:00
16 changed files with 262 additions and 71 deletions

View File

@ -2733,7 +2733,15 @@ bool JOIN::make_aggr_tables_info()
curr_tab->having= having;
having->update_used_tables();
}
curr_tab->distinct= true;
/*
We only need DISTINCT operation if the join is not degenerate.
If it is, we must not request DISTINCT processing, because
remove_duplicates() assumes there is a preceding computation step (and
in the degenerate join, there's none)
*/
if (top_join_tab_count)
curr_tab->distinct= true;
having= NULL;
select_distinct= false;
}