diff options
| author | unknown <jimw@mysql.com> | 2005-07-05 15:23:13 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-05 15:23:13 -0700 |
| commit | 036cd1736979cf13636600f1d3804e47d9a26935 (patch) | |
| tree | 8c64e4587ea98702778dca068bd5159cdb53c5be /mysql-test/r/grant.result | |
| parent | 711464a11de68abe5835a74a41f7c347a1e93b67 (diff) | |
| parent | 8218398c6ae4020c9eae9fd25ebb3a266db45035 (diff) | |
| download | mariadb-git-036cd1736979cf13636600f1d3804e47d9a26935.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/query_cache.result:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/grant.result:
Merge
mysql-test/t/grant.test:
Merge
Diffstat (limited to 'mysql-test/r/grant.result')
| -rw-r--r-- | mysql-test/r/grant.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index d84c9317755..19982c7bb60 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -586,3 +586,8 @@ use test; REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost; DROP USER dummy@localhost; DROP DATABASE mysqltest; +use mysql; +insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select'); +flush privileges; +delete from tables_priv where host = '' and user = 'mysqltest_1'; +flush privileges; |