bk commit into 3.23 tree

[sasha]

Below is the list of changes that have just been pushed into main
3.23. repository. For information on how to access the repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-06-21 16:48:18-06:00, sasha@stripped
  merged test from 4.0

  mysql-test/r/drop.result
    1.3 01/06/21 16:48:17 sasha@stripped +2 -0
    merged a test from 4.0

  mysql-test/t/drop.test
    1.3 01/06/21 16:48:17 sasha@stripped +18 -0
    updated test results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql

--- 1.2/mysql-test/r/drop.result	Thu Jun 21 15:59:50 2001
+++ 1.3/mysql-test/r/drop.result	Thu Jun 21 16:48:17 2001
@@ -1,5 +1,7 @@
 n
 1
+n
+4
 Database
 foo
 mysql

--- 1.2/mysql-test/t/drop.test	Thu Jun 21 15:59:50 2001
+++ 1.3/mysql-test/t/drop.test	Thu Jun 21 16:48:17 2001
@@ -10,6 +10,22 @@
 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 @@
 unlock tables;
 drop database foo;
 show databases;
+
+