database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-01-24 16:14:12 +02:00
parent 55be043c13 fab531a150
commit 947b6b849d
53 changed files with 693 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_acl.cc
View File

@@ -1492,8 +1492,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;
}
@@ -1968,6 +1967,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);
}