summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/drop.result1
-rw-r--r--mysql-test/t/drop.test2
-rw-r--r--mysql-test/t/multi_update.test4
3 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index 8b919964163..223ceb003b3 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -1,5 +1,6 @@
drop table if exists t1;
drop database if exists mysqltest;
+drop database if exists client_test_db;
drop table t1;
ERROR 42S02: Unknown table 't1'
create table t1(n int);
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index 88c47803f48..6f0e5b3f14c 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -2,6 +2,8 @@
--disable_warnings
drop table if exists t1;
drop database if exists mysqltest;
+# If earlier test failed
+drop database if exists client_test_db;
--enable_warnings
--error 1051;
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
index e90de399500..4e42ecc041d 100644
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -5,9 +5,9 @@
--disable_warnings
drop table if exists t1,t2,t3;
drop database if exists mysqltest;
---error 0,1141
+--error 0,1141,1147
revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
---error 0,1141
+--error 0,1141,1147
revoke all privileges on mysqltest.* from mysqltest_1@localhost;
delete from mysql.user where user=_binary'mysqltest_1';
--enable_warnings