diff options
author | unknown <dlenev@mysql.com> | 2005-09-01 17:01:25 +0400 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2005-09-01 17:01:25 +0400 |
commit | 84ddd543c7c10b8022e3b22d1913faa3704d59a8 (patch) | |
tree | 2ba4742d506ba1b6e095df67d530e67f6b82ae7c /mysql-test/r/grant2.result | |
parent | 3aa2467ebbf7b86448fa270b3d77e497f9e2dd11 (diff) | |
parent | 2a64e9a2e89456c412ba1d53026a92a53d28940c (diff) | |
download | mariadb-git-84ddd543c7c10b8022e3b22d1913faa3704d59a8.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg12423
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/grant2.result:
Manual merge.
mysql-test/t/grant2.test:
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 8bd39b0225e..6b6bb697306 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -122,3 +122,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'; |