Commit 8fd14af8 authored by unknown's avatar unknown
Browse files

Ajustement after merge

parent 40a1023a

sql/sql_select.cc

+2 −1
Original line number Diff line number Diff line
@@ -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)