diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-08-19 13:36:24 +0300 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-08-19 13:36:24 +0300 |
| commit | 6387cac94b3342cdf3605cd063c486e1ec2d2a67 (patch) | |
| tree | f05a271a02069f71b122d1fe572f17e888df9795 /sql/sql_select.cc | |
| parent | d4e3b42345468903ac3ac7c0a79f583781767db9 (diff) | |
| download | mariadb-git-6387cac94b3342cdf3605cd063c486e1ec2d2a67.tar.gz | |
Bug#38195: Incorrect handling of aggregate functions when loose index scan
is used causes server crash.
Revert the fix : unstable test case revealed by pushbuild
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6928effc1a5..6de4b296d34 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1724,8 +1724,7 @@ JOIN::exec() if (!items1) { items1= items0 + all_fields.elements; - if (sort_and_group || curr_tmp_table->group || - tmp_table_param.precomputed_group_by) + if (sort_and_group || curr_tmp_table->group) { if (change_to_use_tmp_fields(thd, items1, tmp_fields_list1, tmp_all_fields1, @@ -9260,8 +9259,6 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, MI_COLUMNDEF *recinfo; uint total_uneven_bit_length= 0; bool force_copy_fields= param->force_copy_fields; - /* Treat sum functions as normal ones when loose index scan is used. */ - save_sum_fields|= param->precomputed_group_by; DBUG_ENTER("create_tmp_table"); DBUG_PRINT("enter",("distinct: %d save_sum_fields: %d rows_limit: %lu group: %d", (int) distinct, (int) save_sum_fields, |