diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 08:41:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 08:41:36 +0300 |
| commit | d04f2de80a96b3ff9290ee27507195bfb01fc77f (patch) | |
| tree | 49da698fbe99c5888f41238b0cda4e1eedebf2e2 /sql/sql_select.cc | |
| parent | 5e17b1f7cbfc256850ed139a0a4898040e16ff60 (diff) | |
| parent | b05be3ef8c8668ddbcbe8e1c08dcd4fcc88eb4cf (diff) | |
| download | mariadb-git-d04f2de80a96b3ff9290ee27507195bfb01fc77f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 23de18d0d17..7039c70db05 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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 |