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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-10-11 08:41:36 +03:00
parent 5e17b1f7cb b05be3ef8c
commit d04f2de80a
161 changed files with 1476 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -3127,7 +3127,7 @@ bool JOIN::make_aggr_tables_info()
distinct in the engine, so we do this for all queries, not only
GROUP BY queries.
*/
if (tables_list && !procedure)
if (tables_list && top_join_tab_count && !procedure)
{
/*
At the moment we only support push down for queries where