diff options
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 6e714814526..157eb88406e 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -3784,10 +3784,12 @@ public: } bool set(const Type_handler *handler, const Lex_length_and_dec_st & length_and_dec, + Charset_collation_map_st::Used *used, + const Charset_collation_map_st &map, const Lex_column_charset_collation_attrs_st &cscl, CHARSET_INFO *defcs) { - CHARSET_INFO *tmp= cscl.resolved_to_character_set(defcs); + CHARSET_INFO *tmp= cscl.resolved_to_character_set(used, map, defcs); if (!tmp) return true; set(handler, length_and_dec, tmp); |