mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
olap.result, olap.test:
Added test cases for bug #7914. sql_select.cc: Fixed bug #7914: rollup over expresssions such as sum(a)+1. sql/sql_select.cc: Fixed bug #7914: rollup over expresssions such as sum(a)+1. mysql-test/t/olap.test: Added test cases for bug #7914. mysql-test/r/olap.result: Added test cases for bug #7914.
This commit is contained in:
@ -1181,7 +1181,7 @@ JOIN::exec()
|
||||
}
|
||||
curr_all_fields= &tmp_all_fields1;
|
||||
curr_fields_list= &tmp_fields_list1;
|
||||
set_items_ref_array(items1);
|
||||
curr_join->set_items_ref_array(items1);
|
||||
|
||||
if (sort_and_group || curr_tmp_table->group)
|
||||
{
|
||||
@ -1314,7 +1314,7 @@ JOIN::exec()
|
||||
}
|
||||
curr_fields_list= &curr_join->tmp_fields_list2;
|
||||
curr_all_fields= &curr_join->tmp_all_fields2;
|
||||
set_items_ref_array(items2);
|
||||
curr_join->set_items_ref_array(items2);
|
||||
curr_join->tmp_table_param.field_count+=
|
||||
curr_join->tmp_table_param.sum_func_count;
|
||||
curr_join->tmp_table_param.sum_func_count= 0;
|
||||
@ -1375,7 +1375,7 @@ JOIN::exec()
|
||||
}
|
||||
curr_fields_list= &tmp_fields_list3;
|
||||
curr_all_fields= &tmp_all_fields3;
|
||||
set_items_ref_array(items3);
|
||||
curr_join->set_items_ref_array(items3);
|
||||
|
||||
if (curr_join->make_sum_func_list(*curr_all_fields, *curr_fields_list,
|
||||
1) || thd->is_fatal_error)
|
||||
|
Reference in New Issue
Block a user