1 files changed, 5 insertions, 2 deletions
diff --git a/sql/structs.h b/sql/structs.h
index 0a71719376c..6ec498c61d8 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -773,10 +773,13 @@ public:
     m_ci= cs;
     Lex_length_and_dec_st::reset();
   }
-  bool set(int type, const Lex_column_charset_collation_attrs_st &collation,
+  bool set(int type,
+           Charset_collation_map_st::Used *used,
+           const Charset_collation_map_st &map,
+           const Lex_column_charset_collation_attrs_st &collation,
            CHARSET_INFO *charset)
   {
-    CHARSET_INFO *tmp= collation.resolved_to_character_set(charset);
+    CHARSET_INFO *tmp= collation.resolved_to_character_set(used, map, charset);
     if (!tmp)
       return true;
     set(type, tmp);