Commit 6835272b authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

Make tests more robust (clean up better after grant.test)

parent b922c964

mysql-test/r/grant.result

+2 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,7 @@ ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table ' 
DROP DATABASE mysqltest1;

DROP DATABASE mysqltest2;

DROP USER mysqltest_1@localhost;

DROP USER mysqltest_2@localhost;

use test;

CREATE TABLE t1 (f1 int, f2 int);

INSERT INTO t1 VALUES(1,1), (2,2);
@@ -1124,6 +1125,7 @@ f1 f2 
REVOKE UPDATE (f1) ON `test`.`t1` FROM 'mysqltest_1'@'localhost';

REVOKE SELECT ON `test`.* FROM 'mysqltest_1'@'localhost';

REVOKE ALL ON db27878.* FROM 'mysqltest_1'@'localhost';

DROP USER mysqltest_1@localhost;

DROP DATABASE db27878;

use test;

DROP TABLE t1;

mysql-test/t/grant.test

+2 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,7 @@ DROP DATABASE mysqltest1; 
DROP DATABASE mysqltest2;



DROP USER mysqltest_1@localhost;

DROP USER mysqltest_2@localhost;



#

# Bug#27878: Unchecked privileges on a view referring to a table from another
@@ -1147,6 +1148,7 @@ connection default; 
REVOKE UPDATE (f1) ON `test`.`t1` FROM 'mysqltest_1'@'localhost';

REVOKE SELECT ON `test`.* FROM 'mysqltest_1'@'localhost';

REVOKE ALL ON db27878.* FROM 'mysqltest_1'@'localhost';

DROP USER mysqltest_1@localhost;

DROP DATABASE db27878;

use test;

DROP TABLE t1;