mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:
jimw@mysql.com 2005-03-17 17:24:47 -08:00
commit 7214c51e72
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;
}
curr_join->group_list= 0;
}
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,
1, TRUE) ||
setup_sum_funcs(curr_join->thd, curr_join->sum_funcs) ||
1, TRUE))
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,
0)))
{