diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-01 09:33:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-01 09:33:03 +0300 |
| commit | d72eebaa3dbec025ec43d101a1c8055cfd1ddaef (patch) | |
| tree | 5b2dea3a82cbef8c6b0689ad02419d5bf4e2bf82 /sql/sql_acl.h | |
| parent | 4832b751ad47626f236e25067508230df72749e6 (diff) | |
| parent | 49854811fa499c70ddbf5d7d4daf22c97796b98e (diff) | |
| download | mariadb-git-d72eebaa3dbec025ec43d101a1c8055cfd1ddaef.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 09a721936b9..e9063673b8e 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -409,7 +409,7 @@ bool acl_check_proxy_grant_access (THD *thd, const char *host, const char *user, bool with_grant); int acl_setrole(THD *thd, char *rolename, ulonglong access); int acl_check_setrole(THD *thd, char *rolename, ulonglong *access); -int acl_check_set_default_role(THD *thd, const char *host, const char *user); +int acl_check_set_default_role(THD *thd, const char *host, const char *user, const char *role); int acl_set_default_role(THD *thd, const char *host, const char *user, const char *rolename); |