diff options
Diffstat (limited to 'mysql-test/suite/deny')
| -rw-r--r-- | mysql-test/suite/deny/columns.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/deny/columns.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/deny/global_role.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/deny/global_role.test | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/deny/columns.result b/mysql-test/suite/deny/columns.result index fd97c27f161..3eb6b594b1c 100644 --- a/mysql-test/suite/deny/columns.result +++ b/mysql-test/suite/deny/columns.result @@ -4,6 +4,7 @@ create table deny_db.t1 (a int, b int, secret int); create table deny_db.t2 (a2 int, b2 int, secret2 int); insert into deny_db.t2 values (100, 200, 300); grant all on *.* to foo; +revoke ignore denies on *.* from foo; grant all on deny_db.* to foo; grant all on deny_db.t1 to foo; grant all on deny_db.t2 to foo; diff --git a/mysql-test/suite/deny/columns.test b/mysql-test/suite/deny/columns.test index 889c33ba2b0..d5868e0f779 100644 --- a/mysql-test/suite/deny/columns.test +++ b/mysql-test/suite/deny/columns.test @@ -7,6 +7,7 @@ create table deny_db.t2 (a2 int, b2 int, secret2 int); insert into deny_db.t2 values (100, 200, 300); grant all on *.* to foo; +revoke ignore denies on *.* from foo; grant all on deny_db.* to foo; grant all on deny_db.t1 to foo; grant all on deny_db.t2 to foo; diff --git a/mysql-test/suite/deny/global_role.result b/mysql-test/suite/deny/global_role.result index 4f0c970340e..77e8a6db72b 100644 --- a/mysql-test/suite/deny/global_role.result +++ b/mysql-test/suite/deny/global_role.result @@ -4,6 +4,7 @@ create database some_db; create table some_db.t1 (a int, b int, secret int); create view some_db.v1 as (select a, b, secret from some_db.t1); grant all on *.* to foo; +revoke ignore denies on *.* from foo; grant all on some_db.* to foo; grant all on some_db.t1 to foo; grant all on some_db.v1 to foo; @@ -34,7 +35,7 @@ set role r1; show grants; Grants for foo@% GRANT `r1` TO `foo`@`%` -GRANT ALL PRIVILEGES ON *.* TO `foo`@`%` +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, BINLOG MONITOR, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, DELETE HISTORY, SET USER, FEDERATED ADMIN, CONNECTION ADMIN, READ_ONLY ADMIN, REPLICATION SLAVE ADMIN, REPLICATION MASTER ADMIN, BINLOG ADMIN, BINLOG REPLAY, SLAVE MONITOR ON *.* TO `foo`@`%` GRANT ALL PRIVILEGES ON `some_db`.* TO `foo`@`%` GRANT ALL PRIVILEGES ON `some_db`.`v1` TO `foo`@`%` GRANT ALL PRIVILEGES ON `some_db`.`t1` TO `foo`@`%` @@ -73,7 +74,7 @@ a b secret show grants; Grants for foo@% GRANT `r1` TO `foo`@`%` -GRANT ALL PRIVILEGES ON *.* TO `foo`@`%` +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, BINLOG MONITOR, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER, CREATE TABLESPACE, DELETE HISTORY, SET USER, FEDERATED ADMIN, CONNECTION ADMIN, READ_ONLY ADMIN, REPLICATION SLAVE ADMIN, REPLICATION MASTER ADMIN, BINLOG ADMIN, BINLOG REPLAY, SLAVE MONITOR ON *.* TO `foo`@`%` GRANT ALL PRIVILEGES ON `some_db`.* TO `foo`@`%` GRANT ALL PRIVILEGES ON `some_db`.`v1` TO `foo`@`%` GRANT ALL PRIVILEGES ON `some_db`.`t1` TO `foo`@`%` diff --git a/mysql-test/suite/deny/global_role.test b/mysql-test/suite/deny/global_role.test index eb335342130..9e2bf1bc3fc 100644 --- a/mysql-test/suite/deny/global_role.test +++ b/mysql-test/suite/deny/global_role.test @@ -8,6 +8,7 @@ create table some_db.t1 (a int, b int, secret int); create view some_db.v1 as (select a, b, secret from some_db.t1); grant all on *.* to foo; +revoke ignore denies on *.* from foo; grant all on some_db.* to foo; grant all on some_db.t1 to foo; grant all on some_db.v1 to foo; |