diff options
| author | unknown <serg@serg.mylan> | 2003-08-28 12:37:50 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-08-28 12:37:50 +0200 |
| commit | cdfd72820135ef096014f382b9b45c7e5345eb99 (patch) | |
| tree | e63f20a880220c2ac95fac0353ffef1a3cc5dfdf /sql/sql_select.cc | |
| parent | d1be872edf3978ae2ca143392e3a9d9725117f2b (diff) | |
| download | mariadb-git-cdfd72820135ef096014f382b9b45c7e5345eb99.tar.gz | |
oom protection
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 560f5f5dc79..d48e809966c 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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 || (procedure && (procedure->flags & PROC_GROUP))) { - alloc_group_fields(&join,group); - setup_copy_fields(thd, &join.tmp_table_param,all_fields); - if (make_sum_func_list(&join,all_fields) || thd->fatal_error) + if (alloc_group_fields(&join,group) || + setup_copy_fields(thd, &join.tmp_table_param,all_fields) || + make_sum_func_list(&join,all_fields) || thd->fatal_error) goto err; /* purecov: inspected */ } if (group || order) |