diff options
| author | unknown <dlenev@mysql.com> | 2005-09-01 23:25:29 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-09-01 23:25:29 +0400 |
| commit | 7783dbbcdccc8e45be88cd4d213c022a9fd023ac (patch) | |
| tree | a5830cd512f96c9dfcac6af5cf627770f7fd7a72 /sql/sql_acl.h | |
| parent | f5db9c9a5be0f2f7f78229e2b6054aae3d940c1c (diff) | |
| parent | 84ddd543c7c10b8022e3b22d1913faa3704d59a8 (diff) | |
| download | mariadb-git-7783dbbcdccc8e45be88cd4d213c022a9fd023ac.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423
into mysql.com:/home/dlenev/src/mysql-5.0-merges
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
mysql-test/lib/mtr_process.pl:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
mysql-test/r/grant2.result:
Manual merge.
mysql-test/t/grant2.test:
Manual merge.
sql/sql_acl.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index eba000a627a..6e6f33e68c2 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -174,8 +174,8 @@ public: /* prototypes */ bool hostname_requires_resolving(const char *hostname); -my_bool acl_init(THD *thd, bool dont_read_acl_tables); -void acl_reload(THD *thd); +my_bool acl_init(bool dont_read_acl_tables); +my_bool acl_reload(THD *thd); void acl_free(bool end=0); ulong acl_get(const char *host, const char *ip, const char *user, const char *db, my_bool db_is_pattern); @@ -196,9 +196,9 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table, bool is_proc, List <LEX_USER> &user_list, ulong rights, bool revoke, bool no_error); ACL_USER *check_acl_user(LEX_USER *user_name, uint *acl_acl_userdx); -my_bool grant_init(THD *thd); +my_bool grant_init(); void grant_free(void); -void grant_reload(THD *thd); +my_bool grant_reload(THD *thd); bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, uint show_command, uint number, bool dont_print_error); bool check_grant_column (THD *thd, GRANT_INFO *grant, |