diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-20 00:44:21 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-20 00:44:21 +0200 |
commit | 579f644360768f3318faf0ccfed4578f7190c2c3 (patch) | |
tree | 63bfa52bb0da0a67a093f2131383f3ce22a71155 /sql | |
parent | a19ddf01176ec979b26ef367dd98f135e07049b7 (diff) | |
download | mariadb-git-579f644360768f3318faf0ccfed4578f7190c2c3.tar.gz |
Fix warnings
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item.cc | 2 | ||||
-rw-r--r-- | sql/item.h | 2 | ||||
-rw-r--r-- | sql/sql_lex.cc | 2 | ||||
-rw-r--r-- | sql/sql_lex.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index a62f26dc5cf..2c562fc9a2e 100644 --- a/sql/item.cc +++ b/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)) diff --git a/sql/item.h b/sql/item.h index 68ce9ffdc9e..3056dd43795 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1637,7 +1637,7 @@ public: 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) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index cfa3231236b..f187b57c49f 100644 --- a/sql/sql_lex.cc +++ b/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); diff --git a/sql/sql_lex.h b/sql/sql_lex.h index c0bd522036d..a587a01b3f4 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -892,7 +892,7 @@ public: 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); |