diff options
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 8a34d6a5af1..faeabcd074f 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -851,10 +851,7 @@ int set_var_user::update(THD *thd) int set_var_password::check(THD *thd) { #ifndef NO_EMBEDDED_ACCESS_CHECKS - user= get_current_user(thd, user); - /* Returns 1 as the function sends error to client */ - return check_change_password(thd, user->host.str, user->user.str, - password, strlen(password)) ? 1 : 0; + return check_change_password(thd, user); #else return 0; #endif @@ -863,9 +860,7 @@ int set_var_password::check(THD *thd) int set_var_password::update(THD *thd) { #ifndef NO_EMBEDDED_ACCESS_CHECKS - /* Returns 1 as the function sends error to client */ - return change_password(thd, user->host.str, user->user.str, password) ? - 1 : 0; + return change_password(thd, user); #else return 0; #endif |