diff options
| author | unknown <dlenev@mysql.com> | 2005-09-01 23:25:29 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-09-01 23:25:29 +0400 |
| commit | 7783dbbcdccc8e45be88cd4d213c022a9fd023ac (patch) | |
| tree | a5830cd512f96c9dfcac6af5cf627770f7fd7a72 /mysql-test/r/grant2.result | |
| parent | f5db9c9a5be0f2f7f78229e2b6054aae3d940c1c (diff) | |
| parent | 84ddd543c7c10b8022e3b22d1913faa3704d59a8 (diff) | |
| download | mariadb-git-7783dbbcdccc8e45be88cd4d213c022a9fd023ac.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423
into mysql.com:/home/dlenev/src/mysql-5.0-merges
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
mysql-test/lib/mtr_process.pl:
Manual merge.
mysql-test/mysql-test-run.pl:
Manual merge.
mysql-test/r/grant2.result:
Manual merge.
mysql-test/t/grant2.test:
Manual merge.
sql/sql_acl.cc:
Manual merge.
sql/sql_parse.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/grant2.result')
| -rw-r--r-- | mysql-test/r/grant2.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index 7ac10de1f7c..ca375ef5057 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -312,3 +312,12 @@ flush privileges; drop database mysqltest_1; set password = password("changed"); ERROR 42000: Access denied for user ''@'localhost' to database 'mysql' +lock table mysql.user write; + flush privileges; + grant all on *.* to 'mysqltest_1'@'localhost'; +unlock tables; +lock table mysql.user write; + set password for 'mysqltest_1'@'localhost' = password(''); + revoke all on *.* from 'mysqltest_1'@'localhost'; +unlock tables; +drop user 'mysqltest_1'@'localhost'; |