remove dead code

sql/sql_lex.h

@@ -729,11 +729,6 @@ public:
   friend bool mysql_new_select(LEX *lex, bool move_down, SELECT_LEX *sel);
   friend bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
                               bool open_view_no_parse);
-  friend bool mysql_derived_prepare(THD *thd, LEX *lex,
-                                  TABLE_LIST *orig_table_list);
-  friend bool mysql_derived_merge(THD *thd, LEX *lex,
-                                  TABLE_LIST *orig_table_list);
-  friend bool TABLE_LIST::init_derived(THD *thd, bool init_view);
 private:
   void fast_exclude();
 };

sql/vers_string.h

@@ -97,8 +97,4 @@ public:
 typedef Lex_cstring_with_compare<Compare_identifiers> Lex_ident;
 typedef Lex_cstring_with_compare<Compare_table_names> Lex_table_name;
 
-#define XSTRING_WITH_LEN(X) (X).ptr(), (X).length()
-#define DB_WITH_LEN(X) (X).db.str, (X).db.length
-#define TABLE_NAME_WITH_LEN(X) (X).table_name.str, (X).table_name.length
-
 #endif // VERS_STRING_INCLUDED