diff options
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sql/item.cc b/sql/item.cc index 1c4bfbe2c77..564bc72927c 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1334,7 +1334,6 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) Item_ref *rf; *ref= rf= new Item_ref(last->ref_pointer_array + counter, - 0, (char *)table_name, (char *)field_name); thd->register_item_tree_change(ref, this, &thd->mem_root); @@ -1357,10 +1356,8 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { Item_ref *rf; thd->register_item_tree_change(ref, *ref, &thd->mem_root); - *ref= rf= new Item_ref(ref, 0, - (where->db[0]?where->db:0), - (char *)where->alias, - (char *)field_name); + *ref= rf= new Item_ref((where->db[0] ? where->db : 0), + (char*) where->alias, (char*) field_name); if (!rf) return 1; /* @@ -2061,16 +2058,6 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference) } -void Item_ref::cleanup() -{ - DBUG_ENTER("Item_ref::cleanup"); - Item_ident::cleanup(); - if (hook_ptr) - *hook_ptr= orig_item; - DBUG_VOID_RETURN; -} - - void Item_ref::print(String *str) { if (ref && *ref) |