diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-14 12:28:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-14 12:28:28 +0100 |
| commit | 81b9c78500a9326a85290992a9340eb887b74048 (patch) | |
| tree | 342aa16a9ccae2de95d0eb68a7cbc0c95a0bfea5 | |
| parent | 6daf6bbcfe22895cb76c35e81d68b0f3731b99c3 (diff) | |
| download | mariadb-git-81b9c78500a9326a85290992a9340eb887b74048.tar.gz | |
MDEV-24098: 10.5 followup
remove version data from the test output
| -rw-r--r-- | mysql-test/main/lock_user.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/lock_user.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/lock_user.result b/mysql-test/main/lock_user.result index d2221e2cd8c..3ee8bbf2296 100644 --- a/mysql-test/main/lock_user.result +++ b/mysql-test/main/lock_user.result @@ -163,7 +163,7 @@ CREATE USER `user1`@`localhost` ACCOUNT LOCK PASSWORD EXPIRE alter user user1@localhost PASSWORD EXPIRE INTERVAL 60 DAY ACCOUNT UNLOCK; select * from mysql.global_priv where user='user1'; Host User Priv -localhost user1 {"access":0,"version_id":100509,"plugin":"mysql_native_password","authentication_string":"","account_locked":false,"password_last_changed":0,"password_lifetime":60} +localhost user1 {"access":0,"version_id":XXX,"plugin":"mysql_native_password","authentication_string":"","account_locked":false,"password_last_changed":0,"password_lifetime":60} show create user user1@localhost; CREATE USER for user1@localhost CREATE USER `user1`@`localhost` PASSWORD EXPIRE diff --git a/mysql-test/main/lock_user.test b/mysql-test/main/lock_user.test index 530883f33ef..4e480c19360 100644 --- a/mysql-test/main/lock_user.test +++ b/mysql-test/main/lock_user.test @@ -160,6 +160,7 @@ alter user user1@localhost ACCOUNT LOCK PASSWORD EXPIRE DEFAULT; show create user user1@localhost; # note output needs to be corrected by MDEV-24114: password expire users cannot be unexpired alter user user1@localhost PASSWORD EXPIRE INTERVAL 60 DAY ACCOUNT UNLOCK; +--replace_regex /"version_id":[0-9]*,/"version_id":XXX,/ select * from mysql.global_priv where user='user1'; show create user user1@localhost; |