diff options
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 2ddd40568f9..44104c97e84 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -4405,19 +4405,23 @@ public: bool add_alter_list(LEX_CSTRING par_name, Virtual_column_info *expr, bool par_exists); bool add_alter_list(LEX_CSTRING name, LEX_CSTRING new_name, bool exists); - bool add_alter_list_item_convert_to_charset(CHARSET_INFO *cs) + bool add_alter_list_item_convert_to_charset(Charset_collation_map_st::Used *used, + const Charset_collation_map_st &map, + CHARSET_INFO *cs) { - if (create_info.add_table_option_convert_charset(cs)) + if (create_info.add_table_option_convert_charset(used, map, cs)) return true; alter_info.flags|= ALTER_CONVERT_TO; return false; } bool - add_alter_list_item_convert_to_charset(CHARSET_INFO *cs, + add_alter_list_item_convert_to_charset(Charset_collation_map_st::Used *used, + const Charset_collation_map_st &map, + CHARSET_INFO *cs, const Lex_extended_collation_st &cl) { - if (create_info.add_table_option_convert_charset(cs) || - create_info.add_table_option_convert_collation(cl)) + if (create_info.add_table_option_convert_charset(used, map, cs) || + create_info.add_table_option_convert_collation(used, map, cl)) return true; alter_info.flags|= ALTER_CONVERT_TO; return false; |