1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grant.result, grant.test, sql_acl.cc:

Browse Source 
Fix for a bug #878
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2003-08-22 18:32:11 +03:00
parent e5b841e392
commit 4d2902a27d
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/r/grant.result
View File

@ -100,6 +100,26 @@ GRANT SELECT, REFERENCES, REFERENCES (a) ON `test`.`t1` TO 'mysqltest_1'@'localh
select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1"; select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1";
table_priv column_priv table_priv column_priv
Select,References References Select,References References
grant all on test.* to user1@localhost with grant option;
revoke all on test.* from user1@localhost;
show grants for user1@localhost;
Grants for user1@localhost
GRANT USAGE ON *.* TO 'user1'@'localhost'
GRANT USAGE ON `test`.* TO 'user1'@'localhost' WITH GRANT OPTION
revoke grant option on test.* from user1@localhost;
show grants for user1@localhost;
Grants for user1@localhost
GRANT USAGE ON *.* TO 'user1'@'localhost'
grant all on test.t1 to user2@localhost with grant option;
revoke all on test.t1 from user2@localhost;
show grants for user2@localhost;
Grants for user2@localhost
GRANT USAGE ON *.* TO 'user2'@'localhost'
GRANT USAGE ON `test`.`t1` TO 'user2'@'localhost' WITH GRANT OPTION
revoke grant option on test.t1 from user2@localhost;
show grants for user2@localhost;
Grants for user2@localhost
GRANT USAGE ON *.* TO 'user2'@'localhost'
delete from mysql.user where user='mysqltest_1'; delete from mysql.user where user='mysqltest_1';
delete from mysql.db where user='mysqltest_1'; delete from mysql.db where user='mysqltest_1';
delete from mysql.tables_priv where user='mysqltest_1'; delete from mysql.tables_priv where user='mysqltest_1';

10
mysql-test/t/grant.test
View File

@ -66,6 +66,16 @@ REVOKE insert,insert (a) on t1 from mysqltest_1@localhost;
GRANT references on t1 to mysqltest_1@localhost; GRANT references on t1 to mysqltest_1@localhost;
show grants for mysqltest_1@localhost; show grants for mysqltest_1@localhost;
select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1"; select table_priv,column_priv from mysql.tables_priv where user="mysqltest_1";
grant all on test.* to user1@localhost with grant option;
revoke all on test.* from user1@localhost;
show grants for user1@localhost;
revoke grant option on test.* from user1@localhost;
show grants for user1@localhost;
grant all on test.t1 to user2@localhost with grant option;
revoke all on test.t1 from user2@localhost;
show grants for user2@localhost;
revoke grant option on test.t1 from user2@localhost;
show grants for user2@localhost;
delete from mysql.user where user='mysqltest_1'; delete from mysql.user where user='mysqltest_1';
delete from mysql.db where user='mysqltest_1'; delete from mysql.db where user='mysqltest_1';
delete from mysql.tables_priv where user='mysqltest_1'; delete from mysql.tables_priv where user='mysqltest_1';

2
sql/sql_acl.cc
View File

@ -3049,6 +3049,8 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user)
if (test_all_bits(table_access, (TABLE_ACLS & ~GRANT_ACL))) if (test_all_bits(table_access, (TABLE_ACLS & ~GRANT_ACL)))
global.append("ALL PRIVILEGES",14); global.append("ALL PRIVILEGES",14);
else if (!(table_access & ~GRANT_ACL))
global.append("USAGE",5);
else else
{ {
int found= 0; int found= 0;