mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
5.5-merge
This commit is contained in:
@ -155,7 +155,6 @@ bool check_single_table_access(THD *thd, ulong privilege,
|
||||
bool check_routine_access(THD *thd,ulong want_access,char *db,char *name,
|
||||
bool is_proc, bool no_errors);
|
||||
bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table);
|
||||
bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list);
|
||||
bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc);
|
||||
bool check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv,
|
||||
GRANT_INTERNAL_INFO *grant_internal_info,
|
||||
@ -178,8 +177,6 @@ inline bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table)
|
||||
table->grant.privilege= want_access;
|
||||
return false;
|
||||
}
|
||||
inline bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list)
|
||||
{ return false; }
|
||||
inline bool check_some_routine_access(THD *thd, const char *db,
|
||||
const char *name, bool is_proc)
|
||||
{ return false; }
|
||||
@ -202,4 +199,10 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
|
||||
|
||||
bool check_global_access(THD *thd, ulong want_access);
|
||||
|
||||
inline bool is_supported_parser_charset(CHARSET_INFO *cs)
|
||||
{
|
||||
return test(cs->mbminlen == 1);
|
||||
}
|
||||
|
||||
|
||||
#endif /* SQL_PARSE_INCLUDED */
|
||||
|
Reference in New Issue
Block a user