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/sql_partition.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/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 832f218fb51..d0766f41fea 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -962,8 +962,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, if (init_lex_with_single_table(thd, table, &lex)) goto end; - func_expr->walk(&Item::change_context_processor, 0, - (uchar*) &lex.select_lex.context); + func_expr->walk(&Item::change_context_processor, 0, &lex.select_lex.context); thd->where= "partition function"; /* In execution we must avoid the use of thd->change_item_tree since @@ -1018,8 +1017,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, easier maintenance. This exception should be deprecated at some point in future so that we always throw an error. */ - if (func_expr->walk(&Item::check_valid_arguments_processor, - 0, NULL)) + if (func_expr->walk(&Item::check_valid_arguments_processor, 0, NULL)) { if (is_create_table_ind) { @@ -1038,8 +1036,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, end: end_lex_with_single_table(thd, table, old_lex); #if !defined(DBUG_OFF) - func_expr->walk(&Item::change_context_processor, 0, - (uchar*) 0); + func_expr->walk(&Item::change_context_processor, 0, 0); #endif DBUG_RETURN(result); } |