Merge 10.1 into 10.2

1 files changed, 6 insertions, 2 deletions

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 76687dd0021..6958098d4a6 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1593,8 +1593,7 @@ static bool fix_user_plugin_ptr(ACL_USER *user)
   else
     return true;
 
-  if (user->auth_string.length)
-    set_user_salt(user, user->auth_string.str, user->auth_string.length);
+  set_user_salt(user, user->auth_string.str, user->auth_string.length);
   return false;
 }
 
@@ -2068,6 +2067,11 @@ static bool acl_load(THD *thd, const Grant_tables& tables)
                                 safe_str(user.user.str),
                                 safe_str(user.host.hostname));
             }
+            else if (password_len)
+            {
+              user.auth_string.str= password;
+              user.auth_string.length= password_len;
+            }
 
             fix_user_plugin_ptr(&user);
           }