mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

add Admin_option column to mysql.roles_mapping. update tests/results

Browse source
This commit is contained in:
Sergei Golubchik 2013-10-18 12:21:10 -07:00
commit d0db4f2261
26 changed files with 208 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

31
mysql-test/r/acl_roles_set_role-database-recursive.result
View file

@ -1,20 +1,19 @@
create user 'test_user'@'localhost';
create role test_role1;
create role test_role2;
insert into mysql.roles_mapping values ('localhost', 'test_user', 'test_role1');
insert into mysql.roles_mapping values ('localhost', 'test_user', 'test_role2');
insert into mysql.roles_mapping values ('', 'test_role1', 'test_role2');
grant test_role1 to test_user@localhost;
grant test_role2 to test_user@localhost;
grant test_role2 to test_role1;
select user, host from mysql.user where user not like 'root';
user host
test_role1
test_role2
test_user localhost
select * from mysql.roles_mapping;
Host User Role
test_role1 test_role2
localhost test_user test_role1
localhost test_user test_role2
flush privileges;
Host User Role Admin_option
test_role1 test_role2 N
localhost test_user test_role1 N
localhost test_user test_role2 N
select user, host from mysql.db;
user host
%
@ -31,10 +30,10 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost test_role1
select * from mysql.roles_mapping;
Host User Role
test_role1 test_role2
localhost test_user test_role1
localhost test_user test_role2
Host User Role Admin_option
test_role1 test_role2 N
localhost test_user test_role1 N
localhost test_user test_role2 N
set role none;
select current_user(), current_role();
current_user() current_role()
@ -46,10 +45,10 @@ select current_user(), current_role();
current_user() current_role()
test_user@localhost test_role2
select * from mysql.roles_mapping;
Host User Role
test_role1 test_role2
localhost test_user test_role1
localhost test_user test_role2
Host User Role Admin_option
test_role1 test_role2 N
localhost test_user test_role1 N
localhost test_user test_role2 N
drop user 'test_user'@'localhost';
revoke select on mysql.* from test_role2;
delete from mysql.user where user='test_role1';