Modified set_role_var to implement both a role check in the check() function,

as well as only set privileges in the update() function.

1 files changed, 8 insertions, 2 deletions

diff --git a/sql/set_var.cc b/sql/set_var.cc
index d09e2bcac77..33c360ae785 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -876,14 +876,20 @@ int set_var_password::update(THD *thd)
 *****************************************************************************/
 int set_var_role::check(THD *thd)
 {
-  /* nothing to check */
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+  ulonglong access;
+  int status= acl_check_setrole(thd, base.str, &access);
+  save_result.ulonglong_value= access;
+  return status;
+#else
   return 0;
+#endif
 }
 
 int set_var_role::update(THD *thd)
 {
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
-  return acl_setrole(thd, this->role.str);
+  return acl_setrole(thd, base.str, save_result.ulonglong_value);
 #else
   return 0;
 #endif