Commit acff1161 authored by thek@adventure.(none)'s avatar thek@adventure.(none)

Patch clean up.

Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.
parent 83428ce9
...@@ -1235,8 +1235,8 @@ select col1 from test limit 1 into tmp; ...@@ -1235,8 +1235,8 @@ select col1 from test limit 1 into tmp;
return '1'; return '1';
end| end|
create view v1 as select test.* from test where test.col1=test_function(); create view v1 as select test.* from test where test.col1=test_function();
grant update (col1) on v1 to 'greg'; grant update (col1) on v1 to 'greg'@'localhost';
revoke all privileges on v1 from 'greg'; drop user 'greg'@'localhost';
drop view v1; drop view v1;
drop table test; drop table test;
drop function test_function; drop function test_function;
...@@ -1304,5 +1304,6 @@ CALL mysqltest1.test(); ...@@ -1304,5 +1304,6 @@ CALL mysqltest1.test();
1 1
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
RENAME TABLE mysql.procs_gone TO mysql.procs_priv; RENAME TABLE mysql.procs_gone TO mysql.procs_priv;
DROP USER mysqltest_1@localhost;
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
End of 5.1 tests End of 5.1 tests
...@@ -1282,8 +1282,8 @@ begin ...@@ -1282,8 +1282,8 @@ begin
end| end|
delimiter ;| delimiter ;|
create view v1 as select test.* from test where test.col1=test_function(); create view v1 as select test.* from test where test.col1=test_function();
grant update (col1) on v1 to 'greg'; grant update (col1) on v1 to 'greg'@'localhost';
revoke all privileges on v1 from 'greg'; drop user 'greg'@'localhost';
drop view v1; drop view v1;
drop table test; drop table test;
drop function test_function; drop function test_function;
...@@ -1396,6 +1396,7 @@ GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost; ...@@ -1396,6 +1396,7 @@ GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;
CALL mysqltest1.test(); CALL mysqltest1.test();
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
RENAME TABLE mysql.procs_gone TO mysql.procs_priv; RENAME TABLE mysql.procs_gone TO mysql.procs_priv;
DROP USER mysqltest_1@localhost;
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment