mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-4.0/

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
serg@serg.mylan 2003-08-28 12:39:25 +02:00
commit 476a0c0fff
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_select.cc
View file

@ -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)