Fix warnings

sql/item.cc

@@ -8862,7 +8862,7 @@ void view_error_processor(THD *thd, void *data)
 }
 
 
-inline struct st_select_lex *Item_ident::get_depended_from() const
+inline st_select_lex *Item_ident::get_depended_from() const
 {
   st_select_lex *dep;
   if ((dep= depended_from))

sql/item.h

@@ -1637,7 +1637,7 @@ class Item_ident :public Item
   Item_ident(TABLE_LIST *view_arg, const char *field_name_arg);
   const char *full_name() const;
   void cleanup();
-  struct st_select_lex *get_depended_from() const;
+  st_select_lex *get_depended_from() const;
   bool remove_dependence_processor(uchar * arg);
   virtual void print(String *str, enum_query_type query_type);
   virtual bool change_context_processor(uchar *cntx)

sql/sql_lex.cc

@@ -3521,7 +3521,7 @@ void st_select_lex::set_explain_type()
   for the derived table to which this select belongs to.
 */
 
-void SELECT_LEX::increase_derived_records(uint records)
+void SELECT_LEX::increase_derived_records(ha_rows records)
 {
   SELECT_LEX_UNIT *unit= master_unit();
   DBUG_ASSERT(unit->derived);

sql/sql_lex.h

@@ -892,7 +892,7 @@ class st_select_lex: public st_select_lex_node
             select_limit == 0);
   }
   void mark_as_belong_to_derived(TABLE_LIST *derived);
-  void increase_derived_records(uint records);
+  void increase_derived_records(ha_rows records);
   void update_used_tables();
   void mark_const_derived(bool empty);