mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
olap.result, olap.test:
Added a test for bug #8615. sql_select.cc: Fixed bug #8615. This fix only removed the cause of the reported crash. It does not resolve other problems of rollup queries with DISTINCT. They were fixed in the previous patch for bug 8616. sql/sql_select.cc: Fixed bug #8615. This fix only removed the cause of the reported crash. It does not resolve other problems of rollup queries with DISTINCT. They were fixed in the previous patch for bug 8616. mysql-test/t/olap.test: Added a test for bug #8615. mysql-test/r/olap.result: Added a test for bug #8615.
This commit is contained in:
@ -1269,7 +1269,6 @@ JOIN::exec()
|
||||
{
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
curr_join->group_list= 0;
|
||||
}
|
||||
|
||||
thd->proc_info="Copying to group table";
|
||||
@ -1289,8 +1288,10 @@ JOIN::exec()
|
||||
}
|
||||
}
|
||||
if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list,
|
||||
1) ||
|
||||
(tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table,
|
||||
1))
|
||||
DBUG_VOID_RETURN;
|
||||
curr_join->group_list= 0;
|
||||
if ((tmp_error= do_select(curr_join, (List<Item> *) 0, curr_tmp_table,
|
||||
0)))
|
||||
{
|
||||
error= tmp_error;
|
||||
|
Reference in New Issue
Block a user