database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-9215 Detect cmp_type() and result_type() from field_type()

Browse Source 
Part6: Deriving Item_type_holder from Type_handler_hybrid_real_field_type
This commit is contained in:
Alexander Barkov
2015-12-03 10:10:59 +04:00
parent 7d54d823a0
commit f3ff8b3529
5 changed files with 233 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_union.cc
View File

@ -534,7 +534,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
while ((type= tp++))
{
if (type->result_type() == STRING_RESULT &&
if (type->cmp_type() == STRING_RESULT &&
type->collation.derivation == DERIVATION_NONE)
{
my_error(ER_CANT_AGGREGATE_NCOLLATIONS, MYF(0), "UNION");