diff options
| author | unknown <igor@olga.mysql.com> | 2007-05-11 21:51:14 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-05-11 21:51:14 -0700 |
| commit | 42cc0e874f6345f1645432c07c65609edfad8e22 (patch) | |
| tree | fac771c8ec0d01ba1627ccd50d3f8d192951ba6e /mysql-test/t/grant.test | |
| parent | c9f09703182204e892a24fddea3965701d8cc2fc (diff) | |
| parent | 50c5b549312132b392563e423587d27e3b435210 (diff) | |
| download | mariadb-git-42cc0e874f6345f1645432c07c65609edfad8e22.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
mysql-test/t/grant.test:
Auto merged
mysql-test/r/grant.result:
Manual merge
Diffstat (limited to 'mysql-test/t/grant.test')
| -rw-r--r-- | mysql-test/t/grant.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 20b4aa72456..2cc8a0d1489 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -1257,7 +1257,7 @@ UPDATE v1 SET f2 = 4; SELECT * FROM test.t1; disconnect user1; connection default; -DROP VIEW v1; +DROP DATABASE db27878; use test; DROP TABLE t1; |