diff --git a/sql/sql_type.cc b/sql/sql_type.cc index 32862be371a..720fea7ebb4 100644 --- a/sql/sql_type.cc +++ b/sql/sql_type.cc @@ -5933,6 +5933,18 @@ void Type_handler_geometry::Item_param_set_param_func(Item_param *param, /***************************************************************************/ +bool Type_handler_string_result::union_element_finalize(const Item * item) const +{ + if (item->collation.derivation == DERIVATION_NONE) + { + my_error(ER_CANT_AGGREGATE_NCOLLATIONS, MYF(0), "UNION"); + return true; + } + return false; +} + +/***************************************************************************/ + bool Type_handler::Vers_history_point_resolve_unit(THD *thd, Vers_history_point *point) const diff --git a/sql/sql_type.h b/sql/sql_type.h index b52b1fda678..383ce800f7b 100644 --- a/sql/sql_type.h +++ b/sql/sql_type.h @@ -1187,6 +1187,14 @@ public: virtual Field *make_conversion_table_field(TABLE *TABLE, uint metadata, const Field *target) const= 0; + /* + Performs the final data type validation for a UNION element, + after the regular "aggregation for result" was done. + */ + virtual bool union_element_finalize(const Item * item) const + { + return false; + } virtual bool Column_definition_fix_attributes(Column_definition *c) const= 0; virtual bool Column_definition_prepare_stage1(THD *thd, MEM_ROOT *mem_root, @@ -2236,7 +2244,7 @@ public: void sortlength(THD *thd, const Type_std_attributes *item, SORT_FIELD_ATTR *attr) const; - + bool union_element_finalize(const Item * item) const; bool Column_definition_prepare_stage1(THD *thd, MEM_ROOT *mem_root, Column_definition *c, diff --git a/sql/sql_union.cc b/sql/sql_union.cc index a4ad67ae74e..c89e59a06f8 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1150,12 +1150,12 @@ cont: while ((type= tp++)) { - if (type->cmp_type() == STRING_RESULT && - type->collation.derivation == DERIVATION_NONE) - { - my_error(ER_CANT_AGGREGATE_NCOLLATIONS, MYF(0), "UNION"); + /* + Test if the aggregated data type is OK for a UNION element. + E.g. in case of string data, DERIVATION_NONE is not allowed. + */ + if (type->type_handler()->union_element_finalize(type)) goto err; - } } /*