diff options
author | unknown <anozdrin/alik@quad.> | 2008-02-21 12:24:40 +0300 |
---|---|---|
committer | unknown <anozdrin/alik@quad.> | 2008-02-21 12:24:40 +0300 |
commit | 9bbf256cb3e95d4ebd04ba09afe6ac6e4af10879 (patch) | |
tree | a0612f5b54f463e797291d098ceb491f5d9d6cd7 /mysql-test/t/view_grant.test | |
parent | 88421ee5038ebe83d448110c3386086c2bc71a1f (diff) | |
parent | fa08b280857fde69a70c68bd07797624a52ef262 (diff) | |
download | mariadb-git-9bbf256cb3e95d4ebd04ba09afe6ac6e4af10879.tar.gz |
Merge quad.:/mnt/raid/alik/MySQL/devel/bug-34337/5.0-rt-bug34337
into quad.:/mnt/raid/alik/MySQL/devel/bug-34337/5.1-rt-bug34337
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/t/view.test:
Manually merged.
Diffstat (limited to 'mysql-test/t/view_grant.test')
-rw-r--r-- | mysql-test/t/view_grant.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/view_grant.test b/mysql-test/t/view_grant.test index 3be0148f765..cbc66300173 100644 --- a/mysql-test/t/view_grant.test +++ b/mysql-test/t/view_grant.test @@ -614,6 +614,7 @@ drop database mysqltest; # --disable_warnings drop view if exists v1; +drop table if exists t1; --enable_warnings # Backup anonymous users and remove them. (They get in the way of |