diff options
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index b38d7086548..f02f0ba6056 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3830,7 +3830,10 @@ bool Item_func_set_collation::fix_length_and_dec(THD *thd) if (agg_arg_charsets_for_string_result(collation, args, 1)) return true; Lex_exact_charset_opt_extended_collate cl(collation.collation, true); - if (cl.merge_collation_override(m_set_collation)) + Character_set_collations_used used(thd); + if (cl.merge_collation_override(&used, + thd->variables.character_set_collations, + m_set_collation)) return true; collation.set(cl.collation().charset_info(), DERIVATION_EXPLICIT, args[0]->collation.repertoire); |