diff options
| author | pem@mysql.com <> | 2004-05-07 18:52:06 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-05-07 18:52:06 +0200 |
| commit | bf45960eef96dba7e7a7ffc8c3bfe6627daee2a3 (patch) | |
| tree | 2f7b236a8721d14f1b398964b898d922fd133131 /sql/sql_acl.h | |
| parent | e1182c5226ce1c5f5aff4c1e59798b9d3dccde2a (diff) | |
| parent | df8e3eac456b14b420f724e658eee175d2ee5e57 (diff) | |
| download | mariadb-git-bf45960eef96dba7e7a7ffc8c3bfe6627daee2a3.tar.gz | |
Merge 4.1 -> 5.0
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index d2dd5b23f0d..2ea3b8f5628 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -155,7 +155,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, bool dont_print_error); + uint show_command, uint number, 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); @@ -169,6 +169,6 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list); int mysql_revoke_all(THD *thd, List <LEX_USER> &list); #ifdef NO_EMBEDDED_ACCESS_CHECKS -#define check_grant(A,B,C,D,E) 0 +#define check_grant(A,B,C,D,E,F) 0 #define check_grant_db(A,B) 0 #endif |