diff options
| author | unknown <serg@serg.mylan> | 2003-08-28 12:39:25 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-08-28 12:39:25 +0200 |
| commit | f9aa71db91482e30ce0a9d143b5c6d54d7050eda (patch) | |
| tree | 24fbc89a574c765faa4c6575e4b7ebef5eaf6105 | |
| parent | 6866b92331fa7badc3d5ee34d2663bb4cc369917 (diff) | |
| parent | cdfd72820135ef096014f382b9b45c7e5345eb99 (diff) | |
| download | mariadb-git-f9aa71db91482e30ce0a9d143b5c6d54d7050eda.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -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) |