mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Adjustment after a merge.
This commit is contained in:
@ -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)
|
||||||
|
Reference in New Issue
Block a user