diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 08:08:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 08:08:53 +0300 |
| commit | 2a7810759d4127f30f6705892eb73277325984a9 (patch) | |
| tree | 23f49519d30ad82b565ec442d7e5d38a3a4b4f7e /sql/sql_partition.cc | |
| parent | 7b48da4d7e84759b9d4ceb40b9aeb6d28b27f93c (diff) | |
| parent | 58780b5afbd00a87899c524735ec11b3534e51ee (diff) | |
| download | mariadb-git-2a7810759d4127f30f6705892eb73277325984a9.tar.gz | |
MDEV-22775: Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 86ba393fb7b..1a5ba7c320d 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -2313,6 +2313,8 @@ static int add_column_list_values(String *str, partition_info *part_info, */ if (create_info) { + const Column_derived_attributes + derived_attr(create_info->default_table_charset); Create_field *sql_field; if (!(sql_field= get_sql_field(field_name, @@ -2324,7 +2326,7 @@ static int add_column_list_values(String *str, partition_info *part_info, th= sql_field->type_handler(); if (th->partition_field_check(sql_field->field_name, item_expr)) return 1; - field_cs= get_sql_field_charset(sql_field, create_info); + field_cs= sql_field->explicit_or_derived_charset(&derived_attr); } else { |