extend the test case to better emulate 5.7 user table

mysql-test/main/no_password_column-mdev-11170.result → mysql-test/main/system_mysql_db_507.result

@@ -60,7 +60,12 @@ max_statement_time	decimal(12,6)	NO		0.000000
 #
 # Drop the password column.
 #
-alter table mysql.user drop column password;
+alter table mysql.user drop column password,
+drop column is_role,
+drop column default_role,
+add column password_last_changed timestamp null default null after password_expired,
+add column password_lifetime smallint unsigned after password_last_changed,
+add column account_locked enum('n','y') character set utf8 not null default 'n' after password_lifetime;
 flush privileges;
 #
 # Create users without the password column present.

mysql-test/main/no_password_column-mdev-11170.test → mysql-test/main/system_mysql_db_507.test

@@ -17,7 +17,12 @@ describe mysql.user;
 --echo #
 --echo # Drop the password column.
 --echo #
-alter table mysql.user drop column password;
+alter table mysql.user drop column password,
+                       drop column is_role,
+                       drop column default_role,
+                       add column password_last_changed timestamp null default null after password_expired,
+                       add column password_lifetime smallint unsigned after password_last_changed,
+                       add column account_locked enum('n','y') character set utf8 not null default 'n' after password_lifetime;
 flush privileges;
 
 --echo #