database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup: use is_supported_parser_charset

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-20 21:36:51 +02:00
parent 1a731af194
commit b04f848176
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.h
View File

@ -801,6 +801,10 @@ mysqld_collation_get_by_name(const char *name,
return cs; return cs;
} }
inline bool is_supported_parser_charset(CHARSET_INFO *cs)
{
return MY_TEST(cs->mbminlen == 1);
}
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER

5
sql/sql_parse.h
View File

@ -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); 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 */ #endif /* SQL_PARSE_INCLUDED */

3
sql/sys_vars.cc
View File

@ -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)) if (check_charset_not_null(self, thd, var))
return true; return true;
// Currently, UCS-2 cannot be used as a client character set if (!is_supported_parser_charset((CHARSET_INFO *)(var->save_result.ptr)))
if (((CHARSET_INFO *)(var->save_result.ptr))->mbminlen > 1)
return true; return true;
return false; return false;