diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-26 22:42:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 11:43:02 +0200 |
| commit | ed77ee1aab1c41584bccfc62bee77d7c4d9af8d4 (patch) | |
| tree | ed4d896e4e06db8e0bfa9bc075f0dd39fdda55d6 /sql/item_row.h | |
| parent | e8bdb73adee78253424fbb1ff782ad12700939a1 (diff) | |
| download | mariadb-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_row.h')
| -rw-r--r-- | sql/item_row.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index f632c786a30..eb2686090e1 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -104,14 +104,14 @@ public: table_map not_null_tables() const { return not_null_tables_cache; } virtual void print(String *str, enum_query_type query_type); - bool walk(Item_processor processor, bool walk_subquery, uchar *arg) + bool walk(Item_processor processor, bool walk_subquery, void *arg) { if (walk_args(processor, walk_subquery, arg)) return true; return (this->*processor)(arg); } Item *transform(THD *thd, Item_transformer transformer, uchar *arg); - bool eval_not_null_tables(uchar *opt_arg); + bool eval_not_null_tables(void *opt_arg); uint cols() { return arg_count; } Item* element_index(uint i) { return args[i]; } @@ -119,7 +119,7 @@ public: bool check_cols(uint c); bool null_inside() { return with_null; }; void bring_value(); - bool check_vcol_func_processor(uchar *arg) {return FALSE; } + bool check_vcol_func_processor(void *arg) {return FALSE; } }; #endif /* ITEM_ROW_INCLUDED */ |