Ajustement after merge

8fd14af8 · unknown · 40a1023a · 8fd14af8
Commit 8fd14af8 authored Jan 09, 2006 by unknown
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
@@ -365,7 +365,8 @@ JOIN::prepare(Item ***rref_pointer_array,
    if (having_fix_rc || thd->net.report_error)
      DBUG_RETURN(-1);				/* purecov: inspected */
    if (having->with_sum_func)
-      having->split_sum_func2(thd, ref_pointer_array, all_fields, &having);
+      having->split_sum_func2(thd, ref_pointer_array, all_fields,
+                              &having, TRUE);
    thd->lex->allow_sum_func= save_allow_sum_func;
  }
  if (select_lex->inner_sum_func_list)