diff options
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 78b7e7fca41..4f297c630ad 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -591,9 +591,9 @@ void partition_info::set_show_version_string(String *packet) else { if (part_expr) - part_expr->walk(&Item::intro_version, 0, (uchar*)&version); + part_expr->walk(&Item::intro_version, 0, &version); if (subpart_expr) - subpart_expr->walk(&Item::intro_version, 0, (uchar*)&version); + subpart_expr->walk(&Item::intro_version, 0, &version); if (version == 0) { /* No new functions in partition function */ @@ -1669,8 +1669,7 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type, if (!list_of_part_fields) { DBUG_ASSERT(part_expr); - err= part_expr->walk(&Item::check_partition_func_processor, 0, - NULL); + err= part_expr->walk(&Item::check_partition_func_processor, 0, NULL); } /* Check for sub partition expression. */ @@ -2425,8 +2424,7 @@ bool partition_info::add_column_list_value(THD *thd, Item *item) else thd->where= "partition function"; - if (item->walk(&Item::check_partition_func_processor, 0, - NULL)) + if (item->walk(&Item::check_partition_func_processor, 0, NULL)) { my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0)); DBUG_RETURN(TRUE); |