after merge fix/

2 files changed, 5 insertions, 6 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 6b586c66ecf..3dbc3833f9e 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -311,8 +311,8 @@ Field *Item_sum_hybrid::create_tmp_field(bool group, TABLE *table,
   {
     Field *field= ((Item_field*) args[0])->field;
     
-    if ((field= create_tmp_field_from_field(current_thd, field, this, table,
-					    0, convert_blob_length)))
+    if ((field= create_tmp_field_from_field(current_thd, field, name, table,
+					    NULL, convert_blob_length)))
       field->flags&= ~NOT_NULL_FLAG;
     return field;
   }
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 556d5b3d89b..381ccbba4fd 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -402,10 +402,9 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
 			     int error, bool ignore_last_dupp_error);
 uint find_shortest_key(TABLE *table, const key_map *usable_keys);
 Field* create_tmp_field_from_field(THD *thd, Field* org_field,
-				   Item *item, TABLE *table,
-				   bool modify_item,
-				   uint convert_blob_length);
-
+                                   const char *name, TABLE *table,
+                                   Item_field *item, uint convert_blob_length);
+                                                                      
 /* functions from opt_sum.cc */
 bool simple_pred(Item_func *func_item, Item **args, bool *inv_order);
 int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds);