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/opt_range.cc | |
| 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/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 9cf6c1d5eab..08c93d3a6ed 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3122,8 +3122,7 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond) DBUG_RETURN(TRUE); dt->list.empty(); dt->table= table; - if ((*cond)->walk(&Item::find_selective_predicates_list_processor, 0, - (uchar*) dt)) + if ((*cond)->walk(&Item::find_selective_predicates_list_processor, 0, dt)) DBUG_RETURN(TRUE); if (dt->list.elements > 0) { @@ -12400,7 +12399,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree, double read_time) /* Check if cur_part is referenced in the WHERE clause. */ if (join->conds->walk(&Item::find_item_in_field_list_processor, 0, - (uchar*) key_part_range)) + key_part_range)) goto next_index; } } |