1 files changed, 26 insertions, 18 deletions

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index e811c55ed1b..6996bba8798 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -506,7 +506,16 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
   error= -1;					/* if goto err */
 
   /* Optimize distinct away if possible */
-  order=remove_const(&join,order,conds,&simple_order);
+  {
+    ORDER *org_order= order;
+    order=remove_const(&join,order,conds,&simple_order);
+    /*
+      If we are using ORDER BY NULL or ORDER BY const_expression,
+      return result in any order (even if we are using a GROUP BY)
+    */
+    if (!order && org_order)
+      skip_sort_order= 1;
+  }
   if (group || join.tmp_table_param.sum_func_count)
   {
     if (! hidden_group_fields)
@@ -776,7 +785,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
       procedure->update_refs();
     if (tmp_table->group)
     {						// Already grouped
-      if (!order && !no_order)
+      if (!order && !no_order && !skip_sort_order)
 	order=group;				/* order by group */
       group=0;
     }
@@ -3529,7 +3538,7 @@ const_expression_in_where(COND *cond, Item *comp_item, Item **const_item)
 */
 
 Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
-			Item_result_field ***copy_func, Field **from_field,
+			Item ***copy_func, Field **from_field,
 			bool group, bool modify_item)
 {
   switch (type) {
@@ -3590,12 +3599,12 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
     }
     return new_field;
   }
-  case Item::PROC_ITEM:
   case Item::FUNC_ITEM:
   case Item::COND_ITEM:
   case Item::FIELD_AVG_ITEM:
   case Item::FIELD_STD_ITEM:
     /* The following can only happen with 'CREATE TABLE ... SELECT' */
+  case Item::PROC_ITEM:
   case Item::INT_ITEM:
   case Item::REAL_ITEM:
   case Item::STRING_ITEM:
@@ -3624,10 +3633,10 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
 				    item->name,table,item->binary);
       break;
     }
-    if (copy_func)
-      *((*copy_func)++) = (Item_result_field*) item; // Save for copy_funcs
+    if (copy_func && item->is_result_field())
+      *((*copy_func)++) = item;			// Save for copy_funcs
     if (modify_item)
-      ((Item_result_field*) item)->result_field=new_field;
+      item->set_result_field(new_field);
     return new_field;
   }
   default:					// Dosen't have to be stored
@@ -3661,7 +3670,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   Copy_field *copy=0;
   KEY *keyinfo;
   KEY_PART_INFO *key_part_info;
-  Item_result_field **copy_func;
+  Item **copy_func;
   MI_COLUMNDEF *recinfo;
   uint temp_pool_slot=MY_BIT_NONE;
 
@@ -3725,7 +3734,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
     my_free((gptr) table,MYF(0));		/* purecov: inspected */
     DBUG_RETURN(NULL);				/* purecov: inspected */
   }
-  param->funcs=copy_func;
+  param->items_to_copy= copy_func;
   strmov(tmpname,path);
   /* make table according to fields */
 
@@ -5257,7 +5266,7 @@ end_write(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
   if (!end_of_records)
   {
     copy_fields(&join->tmp_table_param);
-    copy_funcs(join->tmp_table_param.funcs);
+    copy_funcs(join->tmp_table_param.items_to_copy);
 
 #ifdef TO_BE_DELETED
     if (!table->uniques)			// If not unique handling
@@ -5357,7 +5366,7 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
     memcpy(table->record[0]+key_part->offset, group->buff, key_part->length);
 
   init_tmptable_sum_functions(join->sum_funcs);
-  copy_funcs(join->tmp_table_param.funcs);
+  copy_funcs(join->tmp_table_param.items_to_copy);
   if ((error=table->file->write_row(table->record[0])))
   {
     if (create_myisam_from_heap(table, &join->tmp_table_param, error, 0))
@@ -5390,7 +5399,7 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
 
   init_tmptable_sum_functions(join->sum_funcs);
   copy_fields(&join->tmp_table_param);		// Groups are copied twice.
-  copy_funcs(join->tmp_table_param.funcs);
+  copy_funcs(join->tmp_table_param.items_to_copy);
 
   if (!(error=table->file->write_row(table->record[0])))
     join->send_records++;			// New group
@@ -5475,7 +5484,7 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
     if (idx < (int) join->send_group_parts)
     {
       copy_fields(&join->tmp_table_param);
-      copy_funcs(join->tmp_table_param.funcs);
+      copy_funcs(join->tmp_table_param.items_to_copy);
       init_sum_functions(join->sum_funcs);
       if (join->procedure)
 	join->procedure->add();
@@ -7144,7 +7153,7 @@ copy_sum_funcs(Item_sum **func_ptr)
 {
   Item_sum *func;
   for (; (func = *func_ptr) ; func_ptr++)
-    (void) func->save_in_field(func->result_field, 1);
+    (void) func->save_in_result_field(1);
   return;
 }
 
@@ -7171,12 +7180,11 @@ update_sum_func(Item_sum **func_ptr)
 	/* Copy result of functions to record in tmp_table */
 
 void
-copy_funcs(Item_result_field **func_ptr)
+copy_funcs(Item **func_ptr)
 {
-  Item_result_field *func;
+  Item *func;
   for (; (func = *func_ptr) ; func_ptr++)
-    (void) func->save_in_field(func->result_field, 1);
-  return;
+    func->save_in_result_field(1);
 }