diff options
| author | unknown <thek@adventure.(none)> | 2008-02-04 19:55:36 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-02-04 19:55:36 +0100 |
| commit | 4e8ef9c8a26984d969682fc75987bd75171fbcbe (patch) | |
| tree | f4167494b0d5713dde7520f7757ebedee9518800 /mysql-test | |
| parent | 7d5a858d2c600d4b16d721b0159790ab6482afe3 (diff) | |
| download | mariadb-git-4e8ef9c8a26984d969682fc75987bd75171fbcbe.tar.gz | |
Patch clean up.
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.
mysql-test/r/grant.result:
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.
mysql-test/t/grant.test:
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/grant.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/grant.test | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index e4334972845..c157e1d4706 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -1235,8 +1235,8 @@ select col1 from test limit 1 into tmp; return '1'; end| create view v1 as select test.* from test where test.col1=test_function(); -grant update (col1) on v1 to 'greg'; -revoke all privileges on v1 from 'greg'; +grant update (col1) on v1 to 'greg'@'localhost'; +drop user 'greg'@'localhost'; drop view v1; drop table test; drop function test_function; @@ -1304,5 +1304,6 @@ CALL mysqltest1.test(); 1 DROP DATABASE mysqltest1; RENAME TABLE mysql.procs_gone TO mysql.procs_priv; +DROP USER mysqltest_1@localhost; FLUSH PRIVILEGES; End of 5.1 tests diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index e3c7d44ea5c..e540ce703a1 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -1282,8 +1282,8 @@ begin end| delimiter ;| create view v1 as select test.* from test where test.col1=test_function(); -grant update (col1) on v1 to 'greg'; -revoke all privileges on v1 from 'greg'; +grant update (col1) on v1 to 'greg'@'localhost'; +drop user 'greg'@'localhost'; drop view v1; drop table test; drop function test_function; @@ -1396,6 +1396,7 @@ GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost; CALL mysqltest1.test(); DROP DATABASE mysqltest1; RENAME TABLE mysql.procs_gone TO mysql.procs_priv; +DROP USER mysqltest_1@localhost; FLUSH PRIVILEGES; |