bzr commit into mysql-6.0-bugteam branch (epotemkin:2809) Bug#38195 Bug#40884

[First_name Last_name]

#At file:///work/bzr_trees/40884-bug-6.0-bugteam/

 2809 First_name Last_name	2008-12-15
      Bug#40884: Failure of the test case for the bug#38195.
      
      Fix for the bug#38195 was removed by an incorrect merge.
      
      Fix is restored.
modified:
  sql/sql_select.cc

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2008-12-10 15:59:12 +0000
+++ b/sql/sql_select.cc	2008-12-15 23:58:15 +0000
@@ -2452,7 +2452,8 @@ JOIN::exec()
     if (!items1)
     {
       items1= items0 + all_fields.elements;
-      if (sort_and_group || curr_tmp_table->group)
+      if (sort_and_group || curr_tmp_table->group ||
+          tmp_table_param.precomputed_group_by)
       {
 	if (change_to_use_tmp_fields(thd, items1,
 				     tmp_fields_list1, tmp_all_fields1,
@@ -11733,6 +11734,8 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
   ENGINE_COLUMNDEF *recinfo;
   uint total_uneven_bit_length= 0;
   bool force_copy_fields= param->force_copy_fields;
+  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",