diff options
| author | monty@mashka.mysql.fi <> | 2002-09-05 16:17:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-05 16:17:08 +0300 |
| commit | 0281a6b16026299bebebb58af1b88c2d741b57f6 (patch) | |
| tree | 103a1aadee6000a5d09b0ba7c1de75797fb958fa /sql/sql_acl.h | |
| parent | 1a0e3423e6a311a8af79829b6a6088a909f1e320 (diff) | |
| download | mariadb-git-0281a6b16026299bebebb58af1b88c2d741b57f6.tar.gz | |
Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
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 d6cf320c978..0448adc8b1c 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -70,8 +70,8 @@ /* prototypes */ -int acl_init(bool dont_read_acl_tables); -void acl_reload(void); +my_bool acl_init(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, const char *user, const char *db); @@ -87,7 +87,7 @@ 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); -int grant_init(void); +my_bool grant_init(void); void grant_free(void); void grant_reload(void); bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, |