diff options
| author | pem@mysql.com <> | 2003-12-19 18:03:27 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-19 18:03:27 +0100 |
| commit | 99e0ae85c7bb983202e70e5f67d4b4d383b44a80 (patch) | |
| tree | 00894c28662192eed25fdacc555298265a2880ac /sql/sql_acl.h | |
| parent | 7fdf6740c74cf153dd10a62876119e9ac11fbc41 (diff) | |
| parent | c49773237d2bb807e10ffb66c321f87a20f1e1c6 (diff) | |
| download | mariadb-git-99e0ae85c7bb983202e70e5f67d4b4d383b44a80.tar.gz | |
Merge 4.1 to 5.0.
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 9858b403d27..f17c9781e8c 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -58,8 +58,6 @@ #define EXTRA_ACL (1L << 29) #define NO_ACCESS (1L << 30) -#ifndef NO_EMBEDDED_ACCESS_CHECKS - /* Defines to change the above bits to how things are stored in tables This is needed as the 'host' and 'db' table is missing a few privileges @@ -127,8 +125,6 @@ public: char *user,*db; }; - - /* prototypes */ bool hostname_requires_resolving(const char *hostname); @@ -153,7 +149,7 @@ my_bool grant_init(THD *thd); void grant_free(void); void grant_reload(THD *thd); bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, - uint show_command=0, bool dont_print_error=0); + uint show_command, bool dont_print_error); bool check_grant_column (THD *thd,TABLE *table, const char *name, uint length, uint show_command=0); bool check_grant_all_columns(THD *thd, ulong want_access, TABLE *table); @@ -166,5 +162,7 @@ void get_mqh(const char *user, const char *host, USER_CONN *uc); int mysql_drop_user(THD *thd, List <LEX_USER> &list); int mysql_revoke_all(THD *thd, List <LEX_USER> &list); -#endif /*!NO_EMBEDDED_ACCESS_CHECKS*/ - +#ifdef NO_EMBEDDED_ACCESS_CHECKS +#define check_grant(A,B,C,D,E) 0 +#define check_grant_db(A,B) 0 +#endif |