diff --git a/sql/item.cc b/sql/item.cc index 416f889712a..c145e69e88f 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8762,7 +8762,7 @@ bool Item_default_value::fix_fields(THD *thd, Item **items) real_arg= arg->real_item(); if (real_arg->type() != FIELD_ITEM) { - my_error(ER_NO_DEFAULT_FOR_FIELD, MYF(0), arg->name); + my_error(ER_NO_DEFAULT_FOR_FIELD, MYF(0), arg->name.str); goto error; } diff --git a/sql/partition_info.cc b/sql/partition_info.cc index ab4a1cc0360..322fc4e1e93 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -1922,7 +1922,7 @@ void partition_info::report_part_expr_error(bool use_subpart_expr) !(type == HASH_PARTITION && list_of_fields)) { my_error(ER_FIELD_TYPE_NOT_ALLOWED_AS_PARTITION_FIELD, MYF(0), - item_field->name); + item_field->name.str); DBUG_VOID_RETURN; } } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 8793dd9b409..b586cd138de 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3134,7 +3134,7 @@ int select_export::send_data(List &items) ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, ER_THD(thd, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), "string", printable_buff, - item->name, static_cast(row_count)); + item->name.str, static_cast(row_count)); } else if (copier.source_end_pos() < res->ptr() + res->length()) { diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 447d80b8b00..af597c48264 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -156,7 +156,7 @@ bool check_duplicate_names(THD *thd, List &item_list, bool gen_unique_view DBUG_RETURN(FALSE); err: - my_error(ER_DUP_FIELDNAME, MYF(0), item->name); + my_error(ER_DUP_FIELDNAME, MYF(0), item->name.str); DBUG_RETURN(TRUE); }