cleanup: use is_supported_parser_charset
This commit is contained in:
parent
1a731af194
commit
b04f848176
@ -801,6 +801,10 @@ mysqld_collation_get_by_name(const char *name,
|
||||
return cs;
|
||||
}
|
||||
|
||||
inline bool is_supported_parser_charset(CHARSET_INFO *cs)
|
||||
{
|
||||
return MY_TEST(cs->mbminlen == 1);
|
||||
}
|
||||
|
||||
#ifdef MYSQL_SERVER
|
||||
|
||||
|
@ -198,9 +198,4 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
|
||||
|
||||
bool check_global_access(THD *thd, ulong want_access, bool no_errors= false);
|
||||
|
||||
inline bool is_supported_parser_charset(CHARSET_INFO *cs)
|
||||
{
|
||||
return MY_TEST(cs->mbminlen == 1);
|
||||
}
|
||||
|
||||
#endif /* SQL_PARSE_INCLUDED */
|
||||
|
@ -622,8 +622,7 @@ static bool check_cs_client(sys_var *self, THD *thd, set_var *var)
|
||||
if (check_charset_not_null(self, thd, var))
|
||||
return true;
|
||||
|
||||
// Currently, UCS-2 cannot be used as a client character set
|
||||
if (((CHARSET_INFO *)(var->save_result.ptr))->mbminlen > 1)
|
||||
if (!is_supported_parser_charset((CHARSET_INFO *)(var->save_result.ptr)))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user