summaryrefslogtreecommitdiff
path: root/mysql-test/r/drop.result
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-04 20:34:15 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-04 20:34:15 +0300
commita9e22b589677df9035c73e61b80be0fc54d175a5 (patch)
treebf6e8bd7de75f7f9ec6dbf8903d150ed3511a6da /mysql-test/r/drop.result
parent1edca1d7ef6a77d406ea2c1bcaf5d9aff2f4c04c (diff)
parent8dfc3fbbab0dc7b3be98a47423ae74a6b4933864 (diff)
downloadmariadb-git-a9e22b589677df9035c73e61b80be0fc54d175a5.tar.gz
Merge next-mr -> next-4284-merge.
Diffstat (limited to 'mysql-test/r/drop.result')
-rw-r--r--mysql-test/r/drop.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index 8c6bd582232..17ec2b09a0a 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -50,6 +50,7 @@ information_schema
mtr
mysql
mysqltest
+performance_schema
test
flush tables with read lock;
drop database mysqltest;
@@ -61,6 +62,7 @@ Database
information_schema
mtr
mysql
+performance_schema
test
drop database mysqltest;
ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist