diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 16 | ||||
| -rw-r--r-- | sql/set_var.h | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index e994745db68..278a05213a6 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -860,7 +860,11 @@ int set_var_password::check(THD *thd) int set_var_password::update(THD *thd) { #ifndef NO_EMBEDDED_ACCESS_CHECKS - return change_password(thd, user); + Reprepare_observer *save_reprepare_observer= thd->m_reprepare_observer; + thd->m_reprepare_observer= 0; + int res= change_password(thd, user); + thd->m_reprepare_observer= save_reprepare_observer; + return res; #else return 0; #endif @@ -896,8 +900,8 @@ int set_var_role::update(THD *thd) int set_var_default_role::check(THD *thd) { #ifndef NO_EMBEDDED_ACCESS_CHECKS - user= get_current_user(thd, user); - int status= acl_check_set_default_role(thd, user->host.str, user->user.str); + real_user= get_current_user(thd, user); + int status= acl_check_set_default_role(thd, real_user->host.str, real_user->user.str); return status; #else return 0; @@ -907,7 +911,11 @@ int set_var_default_role::check(THD *thd) int set_var_default_role::update(THD *thd) { #ifndef NO_EMBEDDED_ACCESS_CHECKS - return acl_set_default_role(thd, user->host.str, user->user.str, role.str); + 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); + thd->m_reprepare_observer= save_reprepare_observer; + return res; #else return 0; #endif diff --git a/sql/set_var.h b/sql/set_var.h index 66d1bc4e983..15c89f1e2b4 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -344,7 +344,7 @@ public: class set_var_default_role: public set_var_base { - LEX_USER *user; + LEX_USER *user, *real_user; LEX_STRING role; public: set_var_default_role(LEX_USER *user_arg, LEX_STRING role_arg) : |