diff options
author | Sergei Golubchik <serg@mariadb.org> | 2022-09-26 20:26:29 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2022-09-26 20:36:29 +0200 |
commit | 07581249e925c7bbb8562a91a8284b0bd48c4660 (patch) | |
tree | 4370f15f763af8f4058631450f84bdc65b4c0cd1 /sql/sql_acl.cc | |
parent | e30f30d43b0fcb955bd34f773d0cd87cf470d1ca (diff) | |
download | mariadb-git-07581249e925c7bbb8562a91a8284b0bd48c4660.tar.gz |
MDEV-29632 SUPER users created before 10.11 should retain READ_ONLY ADMIN privilege upon upgrade
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 32cb77f7db4..4e9e642d9d9 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1532,6 +1532,11 @@ class User_table_json: public User_table { privilege_t mask= ALL_KNOWN_ACL_100304; ulonglong orig_access= access; + if (version_id < 101100) + { + if (access & SUPER_ACL) + access|= READ_ONLY_ADMIN_ACL; + } if (version_id >= 100509) { mask= ALL_KNOWN_ACL_100509; |