Merge with 4.0.17

1 files changed, 1 insertions, 6 deletions

diff --git a/sql/item.h b/sql/item.h
index a94a7a77597..90a0a706073 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -239,12 +239,7 @@ public:
   const char *field_name;
   st_select_lex *depended_from;
   Item_ident(const char *db_name_par,const char *table_name_par,
-	     const char *field_name_par)
-    :db_name(db_name_par), table_name(table_name_par),
-     field_name(field_name_par), depended_from(0)
-    { name = (char*) field_name_par; }
-  // Constructor used by Item_field & Item_ref (see Item comment)
-  Item_ident(THD *thd, Item_ident &item);
+	     const char *field_name_par);
   const char *full_name() const;
 
   bool remove_dependence_processor(byte * arg);