database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Yuchen Pei
2024-10-15 16:00:44 +11:00
parent a79c9b3812 77ed235d50
commit cd5577ba4a
233 changed files with 740 additions and 43283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@@ -3643,7 +3643,9 @@ bool JOIN::make_aggr_tables_info()
original DISTINCT. Thus, we set select_distinct || group_optimized_away
to Query::distinct.
*/
Query query= {&all_fields, select_distinct || group_optimized_away,
Query query= {&all_fields,
(int) all_fields.elements - (int) fields_list.elements,
select_distinct || group_optimized_away,
tables_list, conds,
group_list, order ? order : group_list, having,
&select_lex->master_unit()->lim};