[MDEV-7978] Post review fixes and cleanups.

* Maintain coding style in sql_yacc.yy in regards to optional clauses.
* Remove unused variable from sql_acl.cc.
* Update test case

1 files changed, 12 insertions, 1 deletions

diff --git a/mysql-test/t/alter_user.test b/mysql-test/t/alter_user.test
index 3a3a7d74ba5..e32d0c29f2e 100644
--- a/mysql-test/t/alter_user.test
+++ b/mysql-test/t/alter_user.test
@@ -45,7 +45,7 @@ alter user boo;
 --echo #--warning ER_CANNOT_USER
 alter if exists user boo;
 
---echo # Test SSL related altering.
+--echo # Test password related altering.
 alter user foo identified by 'something';
 select * from mysql.user where user = 'foo';
 
@@ -61,6 +61,17 @@ select * from mysql.user where user = 'foo';
 alter user foo identified with 'somecoolplugin' using 'somecoolpassphrase';
 select * from mysql.user where user = 'foo';
 
+--echo # Test ssl related altering.
+alter user foo identified by 'something' require SSL;
+select * from mysql.user where user = 'foo';
+
+alter user foo identified by 'something' require X509;
+select * from mysql.user where user = 'foo';
+
+alter user foo identified by 'something'
+require cipher 'text' issuer 'foo_issuer' subject 'foo_subject';
+select * from mysql.user where user = 'foo';
+
 --echo # Test resource limits altering.
 alter user foo with MAX_QUERIES_PER_HOUR 10
                     MAX_UPDATES_PER_HOUR 20