diff options
| author | Mats Kindahl <mats@sun.com> | 2010-04-07 13:58:40 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-04-07 13:58:40 +0200 |
| commit | 46bd78b9ee82b5b51239497445bc55e566e59b07 (patch) | |
| tree | 2f3a5f2cd336f0187f122dc5818b89361570f074 /sql/sql_parse.h | |
| parent | e92b3c587ced3e4104f2ab2ee38168d2b8c8bfb5 (diff) | |
| download | mariadb-git-46bd78b9ee82b5b51239497445bc55e566e59b07.tar.gz | |
WL#5030: Splitting mysql_priv.h
Adding my_global.h first in all files using
NO_EMBEDDED_ACCESS_CHECKS.
Correcting a merge problem resulting from a changed definition
of check_some_access compared to the original patches.
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index 0dae572b6a4..90a37c7e244 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -16,6 +16,7 @@ #ifndef SQL_PARSE_INCLUDED #define SQL_PARSE_INCLUDED +#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ #include "sql_acl.h" /* GLOBAL_ACLS */ class Comp_creator; @@ -177,7 +178,10 @@ inline bool check_routine_access(THD *thd,ulong want_access,char *db, char *name, bool is_proc, bool no_errors) { return false; } inline bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table) -{ return false; } +{ + 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, |