diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-07 15:00:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-07 15:00:27 +0300 |
| commit | 916b237b3f6ee4d8e113d480c53bca232cadbb7b (patch) | |
| tree | 238054b502f633afcb88a3fb1929d860a7e96e91 /sql/sql_acl.cc | |
| parent | a04202673fe8f5a89a88e543e3e0f5b9de5215d2 (diff) | |
| parent | 35977e81f967ebe10db8ee40703801e693b2a0f4 (diff) | |
| download | mariadb-git-916b237b3f6ee4d8e113d480c53bca232cadbb7b.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 345ed4d781a..7b8b2a7ec55 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2196,7 +2196,11 @@ static bool validate_password(THD *thd, const LEX_CSTRING &user, else { if (!thd->slave_thread && - strict_password_validation && has_validation_plugins()) + strict_password_validation && has_validation_plugins() +#ifdef WITH_WSREP + && !thd->wsrep_applier +#endif + ) { my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--strict-password-validation"); return true; |