diff options
| author | unknown <peter@mysql.com> | 2002-11-24 17:26:26 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-11-24 17:26:26 +0300 |
| commit | aa0074e8fc69657148aa214a85acd6342812906e (patch) | |
| tree | bce40fe371fa0025ed0a77a664f62de77cdd04bf /sql/sql_acl.h | |
| parent | aa3692429c4d8253fec399b88c156be585d43c71 (diff) | |
| parent | 663b8e3c07200562ef9cefd81a93af80dc26e888 (diff) | |
| download | mariadb-git-aa0074e8fc69657148aa214a85acd6342812906e.tar.gz | |
Merge....
BitKeeper/etc/logging_ok:
auto-union
client/mysqladmin.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
libmysql/password.c:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index a62026ef03c..66e7d0dad7c 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -81,7 +81,7 @@ /* prototypes */ -my_bool acl_init(bool dont_read_acl_tables); +my_bool acl_init(THD *thd, bool dont_read_acl_tables); void acl_reload(THD *thd); void acl_free(bool end=0); ulong acl_get(const char *host, const char *ip, const char *bin_ip, @@ -98,9 +98,9 @@ int mysql_grant(THD *thd, const char *db, List <LEX_USER> &user_list, int mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list, List <LEX_COLUMN> &column_list, ulong rights, bool revoke); -my_bool grant_init(void); +my_bool grant_init(THD *thd); void grant_free(void); -void grant_reload(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); bool check_grant_column (THD *thd,TABLE *table, const char *name, uint length, |