1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysqldev@production.mysql.com:my/mysql-5.0-build

Browse Source 
into mysql.com:/home/jimw/my/mysql-5.0-build
This commit is contained in:
unknown 2005-03-17 17:24:47 -08:00
commit daf0cd1437
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_select.cc
View File

@ -1386,7 +1386,6 @@ JOIN::exec()
{ {
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
curr_join->group_list= 0;
} }
thd->proc_info="Copying to group table"; thd->proc_info="Copying to group table";
@ -1407,8 +1406,10 @@ JOIN::exec()
} }
} }
if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list, if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list,
1, TRUE) || 1, TRUE))
setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) || DBUG_VOID_RETURN;
curr_join->group_list= 0;
if (setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) ||
(tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table, (tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table,
0))) 0)))
{ {