diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-03-17 14:13:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-03-17 14:13:54 -0700 |
| commit | 761590dcd53162e7b73421eb6a61cd399f4dc70d (patch) | |
| tree | fbac2c943a758634e39a8a8a08a44dacd152133f | |
| parent | 84c3a20ff92e11e8529826831a624677d56e6e7a (diff) | |
| parent | c5537c042ac44fde7c63e8225dcf0590b53cec26 (diff) | |
| download | mariadb-git-761590dcd53162e7b73421eb6a61cd399f4dc70d.tar.gz | |
Merge branch 'bb-10.2-mdev9543' of github.com:MariaDB/server into bb-10.2-mdev9543
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 736e5f21681..02680b71989 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2117,7 +2117,8 @@ bool JOIN::make_aggr_tables_info() group by handler to evaluate the group by */ group_by_handler *gbh= NULL; - if ((tmp_table_param.sum_func_count || group_list) && !procedure) + if (tables_list && (tmp_table_param.sum_func_count || group_list) && + !procedure) { /* At the moment we only support push down for queries where |