diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-05-15 14:04:43 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-05-15 14:04:43 +0300 |
| commit | 14d5dccd7bfd315a33ba4bacd0878e8795b024d9 (patch) | |
| tree | 893c5d254d30e833c785d14a93179789034d8095 /sql/set_var.cc | |
| parent | 9a792dea7bdba4f3cd80215213c2e83a8b404563 (diff) | |
| download | mariadb-git-for-anel.tar.gz | |
Cleanup and othersfor-anel
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 2e4a3af91d4..4b1ef63c5f3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -923,9 +923,17 @@ int set_var_default_role::check(THD *thd) { #ifndef NO_EMBEDDED_ACCESS_CHECKS real_user= get_current_user(thd, user); - int status= acl_check_set_default_role(thd, real_user->host.str, - real_user->user.str, role.str); - return status; + real_role= role.str; + if (role.str == current_role.str) + { + if (!thd->security_ctx->priv_role[0]) + real_role= "NONE"; + else + real_role= thd->security_ctx->priv_role; + } + + return acl_check_set_default_role(thd, real_user->host.str, + real_user->user.str, real_role); #else return 0; #endif @@ -936,7 +944,8 @@ int set_var_default_role::update(THD *thd) #ifndef NO_EMBEDDED_ACCESS_CHECKS Reprepare_observer *save_reprepare_observer= thd->m_reprepare_observer; thd->m_reprepare_observer= 0; - int res= acl_set_default_role(thd, real_user->host.str, real_user->user.str, role.str); + int res= acl_set_default_role(thd, real_user->host.str, real_user->user.str, + real_role); thd->m_reprepare_observer= save_reprepare_observer; return res; #else |