Commit 579f6443 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix warnings

parent a19ddf01
...@@ -8862,7 +8862,7 @@ void view_error_processor(THD *thd, void *data) ...@@ -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; st_select_lex *dep;
if ((dep= depended_from)) if ((dep= depended_from))
......
...@@ -1637,7 +1637,7 @@ public: ...@@ -1637,7 +1637,7 @@ public:
Item_ident(TABLE_LIST *view_arg, const char *field_name_arg); Item_ident(TABLE_LIST *view_arg, const char *field_name_arg);
const char *full_name() const; const char *full_name() const;
void cleanup(); void cleanup();
struct st_select_lex *get_depended_from() const; st_select_lex *get_depended_from() const;
bool remove_dependence_processor(uchar * arg); bool remove_dependence_processor(uchar * arg);
virtual void print(String *str, enum_query_type query_type); virtual void print(String *str, enum_query_type query_type);
virtual bool change_context_processor(uchar *cntx) virtual bool change_context_processor(uchar *cntx)
......
...@@ -3521,7 +3521,7 @@ void st_select_lex::set_explain_type() ...@@ -3521,7 +3521,7 @@ void st_select_lex::set_explain_type()
for the derived table to which this select belongs to. 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(); SELECT_LEX_UNIT *unit= master_unit();
DBUG_ASSERT(unit->derived); DBUG_ASSERT(unit->derived);
......
...@@ -892,7 +892,7 @@ public: ...@@ -892,7 +892,7 @@ public:
select_limit == 0); select_limit == 0);
} }
void mark_as_belong_to_derived(TABLE_LIST *derived); 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 update_used_tables();
void mark_const_derived(bool empty); void mark_const_derived(bool empty);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment