diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/main/grant_kill.result | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/main/grant_kill.result')
| -rw-r--r-- | mysql-test/main/grant_kill.result | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/mysql-test/main/grant_kill.result b/mysql-test/main/grant_kill.result index e1243a39..39a7e8fd 100644 --- a/mysql-test/main/grant_kill.result +++ b/mysql-test/main/grant_kill.result @@ -5,13 +5,13 @@ # MDEV-21743 Split up SUPER privilege to smaller privileges # # -# Test that KILL is not allowed without CONNECTION ADMIN or SUPER +# Test that KILL is not allowed without CONNECTION ADMIN # CREATE USER foo@localhost; GRANT SELECT ON *.* TO foo@localhost; CREATE USER bar@localhost; GRANT ALL PRIVILEGES ON *.* TO bar@localhost; -REVOKE CONNECTION ADMIN, SUPER ON *.* FROM bar@localhost; +REVOKE CONNECTION ADMIN ON *.* FROM bar@localhost; connect foo,localhost,foo,,; connect bar,localhost,bar,,; SELECT user FROM information_schema.processlist ORDER BY user; @@ -47,25 +47,5 @@ disconnect bar; DROP USER foo@localhost; DROP USER bar@localhost; # -# Test that KILL is allowed with SUPER -# -CREATE USER foo@localhost; -GRANT SELECT ON *.* TO foo@localhost; -CREATE USER bar@localhost; -GRANT PROCESS, SUPER ON *.* TO bar@localhost; -connect foo,localhost,foo,,; -connect bar,localhost,bar,,; -SELECT user FROM information_schema.processlist ORDER BY user; -user -bar -foo -root -KILL ID; -connection default; -disconnect foo; -disconnect bar; -DROP USER foo@localhost; -DROP USER bar@localhost; -# # End of 10.5 tests # |