Merged (will need a post-merge fix)

sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/item.cc b/sql/item.cc
index 9ed8b39dece..ec637eb8bce 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1488,14 +1488,13 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
 		   "forward reference in item list");
 	  return -1;
 	}
-
 	Item_ref *rf= (place == IN_HAVING ?
                        new Item_ref(last->ref_pointer_array + counter,
                                     (char *)table_name,
-                                    (char *)field_name) :
+                                    (char *)field_name, this) :
                        new Item_direct_ref(last->ref_pointer_array + counter,
                                            (char *)table_name,
-                                           (char *)field_name));
+                                           (char *)field_name, this));
 	if (!rf)
 	  return 1;
         thd->change_item_tree(ref, rf);