database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-02-10 17:01:45 +01:00
parent 3ae038b732 bc4686f0f4
commit 2195bb4e41
226 changed files with 11199 additions and 2971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_acl.cc
View File

@ -892,7 +892,7 @@ static my_bool do_validate(THD *, plugin_ref plugin, void *arg)
}
static bool validate_password(LEX_USER *user)
static bool validate_password(LEX_USER *user, THD *thd)
{
if (user->pwtext.length || !user->pwhash.length)
{
@ -908,7 +908,8 @@ static bool validate_password(LEX_USER *user)
}
else
{
if (strict_password_validation && has_validation_plugins())
if (!thd->slave_thread &&
strict_password_validation && has_validation_plugins())
{
my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--strict-password-validation");
return true;
@ -2748,7 +2749,7 @@ bool check_change_password(THD *thd, LEX_USER *user)
LEX_USER *real_user= get_current_user(thd, user);
if (fix_and_copy_user(real_user, user, thd) ||
validate_password(real_user))
validate_password(real_user, thd))
return true;
*user= *real_user;
@ -3463,7 +3464,7 @@ static int replace_user_table(THD *thd, TABLE *table, LEX_USER &combo,
}
if (!old_row_exists || combo.pwtext.length || combo.pwhash.length)
if (!handle_as_role && validate_password(&combo))
if (!handle_as_role && validate_password(&combo, thd))
goto end;
/* Update table columns with new privileges */