diff options
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 24506434a76..ab4a1cc0360 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -562,10 +562,11 @@ bool partition_info::set_up_defaults_for_partitioning(THD *thd, handler *file, Check that the user haven't defined the same field twice in key or column list partitioning. */ -char* partition_info::find_duplicate_field() + +const char* partition_info::find_duplicate_field() { - char *field_name_outer, *field_name_inner; - List_iterator<char> it_outer(part_field_list); + const char *field_name_outer, *field_name_inner; + List_iterator<const char> it_outer(part_field_list); uint num_fields= part_field_list.elements; uint i,j; DBUG_ENTER("partition_info::find_duplicate_field"); @@ -573,7 +574,7 @@ char* partition_info::find_duplicate_field() for (i= 0; i < num_fields; i++) { field_name_outer= it_outer++; - List_iterator<char> it_inner(part_field_list); + List_iterator<const char> it_inner(part_field_list); for (j= 0; j < num_fields; j++) { field_name_inner= it_inner++; @@ -1382,7 +1383,7 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type, handlerton *table_engine= default_engine_type; uint i, tot_partitions; bool result= TRUE, table_engine_set; - char *same_name; + const char *same_name; DBUG_ENTER("partition_info::check_partition_info"); DBUG_ASSERT(default_engine_type != partition_hton); @@ -2649,9 +2650,9 @@ bool partition_info::has_same_partitioning(partition_info *new_part_info) } /* Check that it will use the same fields in KEY (fields) list. */ - List_iterator<char> old_field_name_it(part_field_list); - List_iterator<char> new_field_name_it(new_part_info->part_field_list); - char *old_name, *new_name; + List_iterator<const char> old_field_name_it(part_field_list); + List_iterator<const char> new_field_name_it(new_part_info->part_field_list); + const char *old_name, *new_name; while ((old_name= old_field_name_it++)) { new_name= new_field_name_it++; @@ -2664,9 +2665,9 @@ bool partition_info::has_same_partitioning(partition_info *new_part_info) if (is_sub_partitioned()) { /* Check that it will use the same fields in KEY subpart fields list. */ - List_iterator<char> old_field_name_it(subpart_field_list); - List_iterator<char> new_field_name_it(new_part_info->subpart_field_list); - char *old_name, *new_name; + List_iterator<const char> old_field_name_it(subpart_field_list); + List_iterator<const char> new_field_name_it(new_part_info->subpart_field_list); + const char *old_name, *new_name; while ((old_name= old_field_name_it++)) { new_name= new_field_name_it++; |