diff options
| author | unknown <anozdrin@mysql.com> | 2006-03-10 14:48:18 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-03-10 14:48:18 +0300 |
| commit | 2eaf00c6730d20849472599cae19b28623e2713d (patch) | |
| tree | ae4474cd35e1d6d7ce8325487e5e58cded2daf82 /mysql-test/t/view_grant.test | |
| parent | 888f96769e2410793f55bbe925e0f562cc07b294 (diff) | |
| parent | cf539a5ac0420bb15d9eed06998510be4bb46598 (diff) | |
| download | mariadb-git-2eaf00c6730d20849472599cae19b28623e2713d.tar.gz | |
Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/view_grant.test')
| -rw-r--r-- | mysql-test/t/view_grant.test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test index 504c4892808..8335c1de20a 100644 --- a/mysql-test/t/view_grant.test +++ b/mysql-test/t/view_grant.test @@ -718,5 +718,3 @@ show create view v1; show create view v2; drop view v1; drop view v2; - - |