database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch bb-10.4-release into bb-10.5-release

Browse Source
This commit is contained in:
Nikita Malyavin
2021-05-05 23:17:20 +03:00
parent ca1dc0789b a4139f8d68
commit 3f55c56951
109 changed files with 1802 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_acl.cc
View File

@ -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;