summaryrefslogtreecommitdiff
path: root/sql/item_subselect.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-26 22:42:48 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commited77ee1aab1c41584bccfc62bee77d7c4d9af8d4 (patch)
treeed4d896e4e06db8e0bfa9bc075f0dd39fdda55d6 /sql/item_subselect.h
parente8bdb73adee78253424fbb1ff782ad12700939a1 (diff)
downloadmariadb-git-ed77ee1aab1c41584bccfc62bee77d7c4d9af8d4.tar.gz
cleanup: change Item::walk() to take void* not uchar*
and remove all related casts to uchar* also remove a couple of unused methods
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r--sql/item_subselect.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index e5adfaa6bee..edbfc050971 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -215,12 +215,12 @@ public:
*/
virtual void reset_value_registration() {}
enum_parsing_place place() { return parsing_place; }
- bool walk(Item_processor processor, bool walk_subquery, uchar *arg);
- bool mark_as_eliminated_processor(uchar *arg);
- bool eliminate_subselect_processor(uchar *arg);
- bool set_fake_select_as_master_processor(uchar *arg);
- bool enumerate_field_refs_processor(uchar *arg);
- bool check_vcol_func_processor(uchar *arg)
+ bool walk(Item_processor processor, bool walk_subquery, void *arg);
+ bool mark_as_eliminated_processor(void *arg);
+ bool eliminate_subselect_processor(void *arg);
+ bool set_fake_select_as_master_processor(void *arg);
+ bool enumerate_field_refs_processor(void *arg);
+ bool check_vcol_func_processor(void *arg)
{
return mark_unsupported_function("subselect", arg, VCOL_IMPOSSIBLE);
}
@@ -233,7 +233,7 @@ public:
@retval TRUE if the predicate is expensive
@retval FALSE otherwise
*/
- bool is_expensive_processor(uchar *arg) { return is_expensive(); }
+ bool is_expensive_processor(void *arg) { return is_expensive(); }
/**
Get the SELECT_LEX structure associated with this Item.
@@ -242,9 +242,9 @@ public:
st_select_lex* get_select_lex();
virtual bool expr_cache_is_needed(THD *);
virtual void get_cache_parameters(List<Item> &parameters);
- virtual bool is_subquery_processor (uchar *opt_arg) { return 1; }
- bool exists2in_processor(uchar *opt_arg) { return 0; }
- bool limit_index_condition_pushdown_processor(uchar *opt_arg)
+ virtual bool is_subquery_processor (void *opt_arg) { return 1; }
+ bool exists2in_processor(void *opt_arg) { return 0; }
+ bool limit_index_condition_pushdown_processor(void *opt_arg)
{
return TRUE;
}
@@ -393,7 +393,7 @@ public:
bool select_transformer(JOIN *join);
void top_level_item() { abort_on_null=1; }
inline bool is_top_level_item() { return abort_on_null; }
- bool exists2in_processor(uchar *opt_arg);
+ bool exists2in_processor(void *opt_arg);
Item* expr_cache_insert_transformer(THD *thd, uchar *unused);
@@ -699,7 +699,7 @@ public:
in_strategy= (SUBS_STRATEGY_CHOSEN | strategy);
DBUG_VOID_RETURN;
}
- bool exists2in_processor(uchar *opt_arg __attribute__((unused)))
+ bool exists2in_processor(void *opt_arg __attribute__((unused)))
{
return 0;
};