diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-22 12:46:07 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-22 12:46:07 +0400 |
| commit | bd83ad899336c0e4a2212d6f05285c5b94e9f912 (patch) | |
| tree | a95283cd66786801d4ce585e3240e9280e2fd10c /sql/mysql_priv.h | |
| parent | 8ec23470f14323bb85220bae42d154681a4be7f3 (diff) | |
| parent | 481066db52cfaa406ea73812bc237513e0daa076 (diff) | |
| download | mariadb-git-bd83ad899336c0e4a2212d6f05285c5b94e9f912.tar.gz | |
Merge with next-mr-runtime.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ec3779d1ddf..0650cdd7603 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1122,9 +1122,11 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, bool *write_to_binlog); #ifndef NO_EMBEDDED_ACCESS_CHECKS bool check_access(THD *thd, ulong access, const char *db, ulong *save_priv, - bool no_grant, bool no_errors, bool schema_db); -bool check_table_access(THD *thd, ulong want_access, TABLE_LIST *tables, - uint number, bool no_errors); + bool no_grant, bool no_errors, bool schema_db); +bool check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables, + bool any_combination_of_privileges_will_do, + uint number, + bool no_errors); #else inline bool check_access(THD *thd, ulong access, const char *db, ulong *save_priv, bool no_grant, bool no_errors, @@ -1134,8 +1136,10 @@ inline bool check_access(THD *thd, ulong access, const char *db, *save_priv= GLOBAL_ACLS; return false; } -inline bool check_table_access(THD *thd, ulong want_access, TABLE_LIST *tables, - uint number, bool no_errors) +inline bool check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables, + bool no_errors, + bool any_combination_of_privileges_will_do, + uint number) { return false; } #endif /*NO_EMBEDDED_ACCESS_CHECKS*/ |