Merge branch 'bb-10.2-mdev9543' of github.com:MariaDB/server into bb-10.2-mdev9543

761590dc · Igor Babaev · 84c3a20f · c5537c04 · 761590dc
Commit 761590dc authored Mar 17, 2016 by Igor Babaev
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_select.cc sql/sql_select.cc +2 -1

No files found.
--- 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