Merge branch '10.3' into 10.4

5 files changed, 116 insertions, 31 deletions

diff --git a/mysql-test/suite/plugins/r/binlog-simple_plugin_check.result b/mysql-test/suite/plugins/r/binlog-simple_plugin_check.result
index 6c960ee325c..1cba628db07 100644
--- a/mysql-test/suite/plugins/r/binlog-simple_plugin_check.result
+++ b/mysql-test/suite/plugins/r/binlog-simple_plugin_check.result
@@ -8,7 +8,7 @@ simple_password_check
 #
 CREATE USER user1@localhost IDENTIFIED BY 'BsG9#9.cem#!85';
 CREATE USER user2@localhost IDENTIFIED BY 'bsg9#d.cem#!85';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
 DROP USER user1@localhost;
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/suite/plugins/r/cracklib_password_check.result b/mysql-test/suite/plugins/r/cracklib_password_check.result
index 1194e6eef5a..218d12fb884 100644
--- a/mysql-test/suite/plugins/r/cracklib_password_check.result
+++ b/mysql-test/suite/plugins/r/cracklib_password_check.result
@@ -14,29 +14,29 @@ LOAD_OPTION	ON
 PLUGIN_MATURITY	Stable
 PLUGIN_AUTH_VERSION	1.0
 grant select on *.* to foocar identified by 'foocar';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (cracklib_password_check)
 show warnings;
 Level	Code	Message
 Warning	1819	cracklib: it is based on your username
-Error	1819	Your password does not satisfy the current policy requirements
+Error	1819	Your password does not satisfy the current policy requirements (cracklib_password_check)
 grant select on *.* to foocar identified by 'racoof';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (cracklib_password_check)
 show warnings;
 Level	Code	Message
 Warning	1819	cracklib: it is based on your username
-Error	1819	Your password does not satisfy the current policy requirements
+Error	1819	Your password does not satisfy the current policy requirements (cracklib_password_check)
 grant select on *.* to foo@barbar identified by 'barbar';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (cracklib_password_check)
 show warnings;
 Level	Code	Message
 Warning	1819	cracklib: it does not contain enough DIFFERENT characters
-Error	1819	Your password does not satisfy the current policy requirements
+Error	1819	Your password does not satisfy the current policy requirements (cracklib_password_check)
 grant select on *.* to foobar identified by 'qwerty';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (cracklib_password_check)
 show warnings;
 Level	Code	Message
 Warning	1819	cracklib: it is based on a dictionary word
-Error	1819	Your password does not satisfy the current policy requirements
+Error	1819	Your password does not satisfy the current policy requirements (cracklib_password_check)
 grant select on *.* to foobar identified by 'q$%^&*rty';
 drop user foobar;
 #
@@ -44,7 +44,7 @@ drop user foobar;
 # when using cracklib plugin
 #
 create user 'newuser'@'localhost';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (cracklib_password_check)
 uninstall plugin cracklib_password_check;
 create user foo1 identified by 'pwd';
 drop user foo1;
diff --git a/mysql-test/suite/plugins/r/simple_password_check.result b/mysql-test/suite/plugins/r/simple_password_check.result
index b04c5535a3f..c4f8d15fc51 100644
--- a/mysql-test/suite/plugins/r/simple_password_check.result
+++ b/mysql-test/suite/plugins/r/simple_password_check.result
@@ -71,13 +71,37 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 create user foo1 identified by 'pwd';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Too short password (< 8)
+Warning	1819	simple_password_check: Not enough upper case letters (< 1)
+Warning	1819	simple_password_check: Not enough digits (< 1)
+Warning	1819	simple_password_check: Not enough special characters (< 1)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo1'@'%'
 create user foo1;
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: The password equal to the user name
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo1'@'%'
 grant select on *.* to foo1 identified by 'pwd';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Too short password (< 8)
+Warning	1819	simple_password_check: Not enough upper case letters (< 1)
+Warning	1819	simple_password_check: Not enough digits (< 1)
+Warning	1819	simple_password_check: Not enough special characters (< 1)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 grant select on *.* to `FooBar1!` identified by 'FooBar1!';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: The password equal to the user name
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 grant select on *.* to `BarFoo1!` identified by 'FooBar1!';
 drop user `BarFoo1!`;
 create user foo1 identified by 'aA.12345';
@@ -99,28 +123,64 @@ simple_password_check_other_characters	3
 create user foo1 identified by '123:qwe:ASD!';
 drop user foo1;
 create user foo1 identified by '-23:qwe:ASD!';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough digits (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo1'@'%'
 create user foo1 identified by '123:4we:ASD!';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough lower case letters (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo1'@'%'
 create user foo1 identified by '123:qwe:4SD!';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough upper case letters (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo1'@'%'
 create user foo1 identified by '123:qwe:ASD4';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough special characters (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo1'@'%'
 create user foo1 identified by '123:qwe:ASD!';
 set password for foo1 = password('qwe:-23:ASD!');
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough digits (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 set password for foo1 = old_password('4we:123:ASD!');
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
 set password for foo1 = password('qwe:123:4SD!');
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough upper case letters (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 set password for foo1 = old_password('qwe:123:ASD4');
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: Not enough special characters (< 3)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 set password for foo1 = password('qwe:123:ASD!');
 select @@strict_password_validation;
 @@strict_password_validation
 1
 set password for foo1 = '';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: The password equal to the user name
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 set password for foo1 = '2222222222222222';
 ERROR HY000: The MariaDB server is running with the --strict-password-validation option so it cannot execute this statement
 set password for foo1 = '11111111111111111111111111111111111111111';
@@ -134,15 +194,24 @@ ERROR HY000: The MariaDB server is running with the --strict-password-validation
 grant select on *.* to foo2 identified with mysql_old_password using '2222222222222222';
 ERROR HY000: The MariaDB server is running with the --strict-password-validation option so it cannot execute this statement
 create user foo2 identified with mysql_native_password using '';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: The password equal to the user name
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
+Error	1396	Operation CREATE USER failed for 'foo2'@'%'
 grant select on *.* to foo2 identified with mysql_old_password using '';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
 grant select on *.* to foo2 identified with mysql_old_password;
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
 update mysql.global_priv set priv=json_set(priv, '$.authentication_string', 'xxx') where user='foo1';
 set global strict_password_validation=0;
 set password for foo1 = '';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
+show warnings;
+Level	Code	Message
+Warning	1819	simple_password_check: The password equal to the user name
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 set password for foo1 = '2222222222222222';
 set password for foo1 = '11111111111111111111111111111111111111111';
 create user foo2 identified by password '11111111111111111111111111111111111111111';
diff --git a/mysql-test/suite/plugins/r/two_password_validations.result b/mysql-test/suite/plugins/r/two_password_validations.result
index dc6bab3c2d5..4bd674baebb 100644
--- a/mysql-test/suite/plugins/r/two_password_validations.result
+++ b/mysql-test/suite/plugins/r/two_password_validations.result
@@ -5,16 +5,18 @@ install soname "cracklib_password_check";
 grant select on *.* to foobar identified by 'q$%^&*R1234ty';
 drop user foobar;
 grant select on *.* to Fff_fff1 identified by '1fff_ffF';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (cracklib_password_check)
 show warnings;
 Level	Code	Message
 Warning	1819	cracklib: it does not contain enough DIFFERENT characters
-Error	1819	Your password does not satisfy the current policy requirements
+Error	1819	Your password does not satisfy the current policy requirements (cracklib_password_check)
 grant select on *.* to foobar identified by 'q-%^&*rty';
-ERROR HY000: Your password does not satisfy the current policy requirements
+ERROR HY000: Your password does not satisfy the current policy requirements (simple_password_check)
 show warnings;
 Level	Code	Message
-Error	1819	Your password does not satisfy the current policy requirements
+Warning	1819	simple_password_check: Not enough upper case letters (< 1)
+Warning	1819	simple_password_check: Not enough digits (< 1)
+Error	1819	Your password does not satisfy the current policy requirements (simple_password_check)
 uninstall plugin simple_password_check;
 grant select on *.* to foobar identified by 'q-%^&*rty';
 drop user foobar;
diff --git a/mysql-test/suite/plugins/t/simple_password_check.test b/mysql-test/suite/plugins/t/simple_password_check.test
index dfb078df638..3ce2d86cd68 100644
--- a/mysql-test/suite/plugins/t/simple_password_check.test
+++ b/mysql-test/suite/plugins/t/simple_password_check.test
@@ -15,16 +15,20 @@ select * from information_schema.system_variables where variable_name like 'simp
 
 --error ER_NOT_VALID_PASSWORD
 create user foo1 identified by 'pwd';
+show warnings;
 
 # Create user with no password.
 --error ER_NOT_VALID_PASSWORD
 create user foo1;
+show warnings;
 
 --error ER_NOT_VALID_PASSWORD
 grant select on *.* to foo1 identified by 'pwd';
+show warnings;
 
 --error ER_NOT_VALID_PASSWORD
 grant select on *.* to `FooBar1!` identified by 'FooBar1!';
+show warnings;
 
 grant select on *.* to `BarFoo1!` identified by 'FooBar1!';
 drop user `BarFoo1!`;
@@ -43,25 +47,32 @@ drop user foo1;
 
 --error ER_NOT_VALID_PASSWORD
 create user foo1 identified by '-23:qwe:ASD!';
+show warnings;
 
 --error ER_NOT_VALID_PASSWORD
 create user foo1 identified by '123:4we:ASD!';
+show warnings;
 
 --error ER_NOT_VALID_PASSWORD
 create user foo1 identified by '123:qwe:4SD!';
+show warnings;
 
 --error ER_NOT_VALID_PASSWORD
 create user foo1 identified by '123:qwe:ASD4';
+show warnings;
 
 create user foo1 identified by '123:qwe:ASD!';
 --error ER_NOT_VALID_PASSWORD
 set password for foo1 = password('qwe:-23:ASD!');
+show warnings;
 --error ER_NOT_VALID_PASSWORD
 set password for foo1 = old_password('4we:123:ASD!');
 --error ER_NOT_VALID_PASSWORD
 set password for foo1 = password('qwe:123:4SD!');
+show warnings;
 --error ER_NOT_VALID_PASSWORD
 set password for foo1 = old_password('qwe:123:ASD4');
+show warnings;
 set password for foo1 = password('qwe:123:ASD!');
 
 # now, strict_password_validation
@@ -69,6 +80,7 @@ select @@strict_password_validation;
 
 --error ER_NOT_VALID_PASSWORD
 set password for foo1 = '';
+show warnings;
 --error ER_OPTION_PREVENTS_STATEMENT
 set password for foo1 = '2222222222222222';
 --error ER_OPTION_PREVENTS_STATEMENT
@@ -83,6 +95,7 @@ create user foo2 identified with mysql_native_password using '111111111111111111
 grant select on *.* to foo2 identified with mysql_old_password using '2222222222222222';
 --error ER_NOT_VALID_PASSWORD
 create user foo2 identified with mysql_native_password using '';
+show warnings;
 --error ER_NOT_VALID_PASSWORD
 grant select on *.* to foo2 identified with mysql_old_password using '';
 --error ER_NOT_VALID_PASSWORD
@@ -95,6 +108,7 @@ set global strict_password_validation=0;
 
 --error ER_NOT_VALID_PASSWORD
 set password for foo1 = '';
+show warnings;
 set password for foo1 = '2222222222222222';
 set password for foo1 = '11111111111111111111111111111111111111111';
 create user foo2 identified by password '11111111111111111111111111111111111111111';