From bd1500fc10f9f5646603da663de6a748da9e741c Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Thu, 21 Jun 2001 16:48:18 -0600
Subject: [PATCH] merged test from 4.0

---
 mysql-test/r/drop.result |  2 ++
 mysql-test/t/drop.test   | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index c7a4ca9e0d2..741fc6bba85 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -1,5 +1,7 @@
 n
 1
+n
+4
 Database
 foo
 mysql
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index 8f9aa852e8b..2a45fe8253b 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -10,6 +10,22 @@ insert into t1 values(2);
 create table t1(n int);
 drop table t1;
 select * from t1;
+
+#now test for a bug in drop database - it is important that the name
+#of the table is the same as the name of the database - in the original
+#code this triggered a bug
+drop database if exists foo;
+create database foo;
+drop database if exists foo;
+create database foo;
+create table foo.foo (n int);
+insert into foo.foo values (4);
+select * from foo.foo;
+drop database if exists foo;
+create database foo;
+drop database foo;
+
+# test drop/create database and FLUSH TABLES WITH READ LOCK
 drop database if exists foo;
 flush tables with read lock;
 --error 1209
@@ -23,3 +39,5 @@ drop database foo;
 unlock tables;
 drop database foo;
 show databases;
+
+