Commit 8fd14af8 authored by unknown's avatar unknown

Ajustement after merge

parent 40a1023a
...@@ -365,7 +365,8 @@ JOIN::prepare(Item ***rref_pointer_array, ...@@ -365,7 +365,8 @@ JOIN::prepare(Item ***rref_pointer_array,
if (having_fix_rc || thd->net.report_error) if (having_fix_rc || thd->net.report_error)
DBUG_RETURN(-1); /* purecov: inspected */ DBUG_RETURN(-1); /* purecov: inspected */
if (having->with_sum_func) 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; thd->lex->allow_sum_func= save_allow_sum_func;
} }
if (select_lex->inner_sum_func_list) if (select_lex->inner_sum_func_list)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment