diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 13:18:03 -0700 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-18 13:18:03 -0700 |
commit | 4ec26a7c2dbb2a49fbedf14f0ca7d126703916ae (patch) | |
tree | 1f6b4557c39c569adf5ad921722f8f0109818f73 /mysql-test | |
parent | 4d3e4c2984d8100fa8d0cdc01e5f1806c590b56e (diff) | |
download | mariadb-git-4ec26a7c2dbb2a49fbedf14f0ca7d126703916ae.tar.gz |
replication of GRANT role statement
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/acl_roles_rpl_definer.result | 27 | ||||
-rw-r--r-- | mysql-test/t/acl_roles_rpl_definer.test | 12 |
2 files changed, 35 insertions, 4 deletions
diff --git a/mysql-test/r/acl_roles_rpl_definer.result b/mysql-test/r/acl_roles_rpl_definer.result index 158e420c03e..eadb6315d9b 100644 --- a/mysql-test/r/acl_roles_rpl_definer.result +++ b/mysql-test/r/acl_roles_rpl_definer.result @@ -1,9 +1,20 @@ include/master-slave.inc [connection master] create role role1; -grant execute on test.* to role1; -grant role1 to current_user; +create role role2; +grant execute on test.* to role2; +grant role2 to role1; set role role1; +show grants; +Grants for root@localhost +GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION +GRANT EXECUTE ON `test`.* TO 'role2' +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION +GRANT USAGE ON *.* TO 'role1' +GRANT USAGE ON *.* TO 'role2' +GRANT role1 TO 'root'@'localhost' WITH ADMIN OPTION +GRANT role2 TO 'role1' +GRANT role2 TO 'root'@'localhost' WITH ADMIN OPTION create definer=current_user procedure pcu() select current_user; create definer=root@localhost procedure pu() select "root@localhost"; create definer=current_role procedure pcr() select current_role; @@ -25,6 +36,17 @@ Procedure sql_mode Create Procedure character_set_client collation_connection Da pr CREATE DEFINER=`role1` PROCEDURE `pr`() select "role1" latin1 latin1_swedish_ci latin1_swedish_ci [connection slave] +set role role1; +show grants; +Grants for root@localhost +GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION +GRANT EXECUTE ON `test`.* TO 'role2' +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION +GRANT USAGE ON *.* TO 'role1' +GRANT USAGE ON *.* TO 'role2' +GRANT role1 TO 'root'@'localhost' WITH ADMIN OPTION +GRANT role2 TO 'role1' +GRANT role2 TO 'root'@'localhost' WITH ADMIN OPTION show create procedure pcu; Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation pcu CREATE DEFINER=`root`@`localhost` PROCEDURE `pcu`() @@ -46,4 +68,5 @@ drop procedure pu; drop procedure pcr; drop procedure pr; drop role role1; +drop role role2; include/rpl_end.inc diff --git a/mysql-test/t/acl_roles_rpl_definer.test b/mysql-test/t/acl_roles_rpl_definer.test index ba192d1fa2a..86d69de86aa 100644 --- a/mysql-test/t/acl_roles_rpl_definer.test +++ b/mysql-test/t/acl_roles_rpl_definer.test @@ -5,9 +5,12 @@ --source include/master-slave.inc create role role1; -grant execute on test.* to role1; -grant role1 to current_user; +create role role2; +grant execute on test.* to role2; +grant role2 to role1; set role role1; +--sorted_result +show grants; create definer=current_user procedure pcu() select current_user; create definer=root@localhost procedure pu() select "root@localhost"; @@ -23,6 +26,10 @@ sync_slave_with_master; connection slave; echo [connection slave]; +set role role1; +--sorted_result +show grants; + show create procedure pcu; show create procedure pu; show create procedure pcr; @@ -35,6 +42,7 @@ drop procedure pu; drop procedure pcr; drop procedure pr; drop role role1; +drop role role2; --source include/rpl_end.inc |