mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
oom protection
This commit is contained in:
@@ -906,9 +906,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
|
|||||||
if (join.group || join.tmp_table_param.sum_func_count ||
|
if (join.group || join.tmp_table_param.sum_func_count ||
|
||||||
(procedure && (procedure->flags & PROC_GROUP)))
|
(procedure && (procedure->flags & PROC_GROUP)))
|
||||||
{
|
{
|
||||||
alloc_group_fields(&join,group);
|
if (alloc_group_fields(&join,group) ||
|
||||||
setup_copy_fields(thd, &join.tmp_table_param,all_fields);
|
setup_copy_fields(thd, &join.tmp_table_param,all_fields) ||
|
||||||
if (make_sum_func_list(&join,all_fields) || thd->fatal_error)
|
make_sum_func_list(&join,all_fields) || thd->fatal_error)
|
||||||
goto err; /* purecov: inspected */
|
goto err; /* purecov: inspected */
|
||||||
}
|
}
|
||||||
if (group || order)
|
if (group || order)
|
||||||
|
Reference in New Issue
Block a user