diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2005-10-06 10:54:07 +0200 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2005-10-06 10:54:07 +0200 |
| commit | 620b7bafb0182949463e706fc91c0144328d0d34 (patch) | |
| tree | cbe58ba165511396b212afaa1654a226d8ae88a4 /sql/sql_acl.h | |
| parent | 418808ba9ab51a5e0dec3ed7f00b1a8e1689ebca (diff) | |
| parent | 3af12c477662114f4e118bba6806af65f64b9793 (diff) | |
| download | mariadb-git-620b7bafb0182949463e706fc91c0144328d0d34.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 0d739e860e9..0a9c6ba785f 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -182,7 +182,8 @@ ulong acl_get(const char *host, const char *ip, const char *user, const char *db, my_bool db_is_pattern); int acl_getroot(THD *thd, USER_RESOURCES *mqh, const char *passwd, uint passwd_len); -int acl_getroot_no_password(THD *thd); +bool acl_getroot_no_password(Security_context *sctx, char *user, char *host, + char *ip, char *db); bool acl_check_host(const char *host, const char *ip); bool check_change_password(THD *thd, const char *host, const char *user, char *password, uint password_len); |