From 5ebbc834febff6e37228196424de074c83e80671 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Tue, 8 Feb 2005 15:14:14 -0800
Subject: [PATCH] Fix removal of tables from cache when the database they are
 contained within is dropped and lower_case_table_names is set. (Bug #8355)

---
 mysql-test/r/lowercase_table2.result | 18 ++++++++++++++++++
 mysql-test/t/lowercase_table2.test   | 17 +++++++++++++++++
 sql/mysql_priv.h                     |  2 +-
 sql/sql_base.cc                      | 12 +++++++++++-
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/lowercase_table2.result b/mysql-test/r/lowercase_table2.result
index a79b6b04063..8361b66817a 100644
--- a/mysql-test/r/lowercase_table2.result
+++ b/mysql-test/r/lowercase_table2.result
@@ -141,3 +141,21 @@ select * from T1;
 a	b
 1	abc
 drop table T1;
+create database mysqltest_LC2;
+use mysqltest_LC2;
+create table myUC (i int);
+insert into myUC values (1),(2),(3);
+select * from myUC;
+i
+1
+2
+3
+use test;
+drop database mysqltest_LC2;
+create database mysqltest_LC2;
+use mysqltest_LC2;
+create table myUC (i int);
+select * from myUC;
+i
+use test;
+drop database mysqltest_LC2;
diff --git a/mysql-test/t/lowercase_table2.test b/mysql-test/t/lowercase_table2.test
index a766e39abab..eff5f2a99ec 100644
--- a/mysql-test/t/lowercase_table2.test
+++ b/mysql-test/t/lowercase_table2.test
@@ -111,3 +111,20 @@ select * from T1;
 alter table T1 add index (a);
 select * from T1;
 drop table T1;
+
+#
+# Bug #8355: Tables not dropped from table cache on drop db
+#
+create database mysqltest_LC2;
+use mysqltest_LC2;
+create table myUC (i int);
+insert into myUC values (1),(2),(3);
+select * from myUC;
+use test;
+drop database mysqltest_LC2;
+create database mysqltest_LC2;
+use mysqltest_LC2;
+create table myUC (i int);
+select * from myUC;
+use test;
+drop database mysqltest_LC2;
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 6218bc49f53..f851e36dcad 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -750,7 +750,7 @@ bool close_temporary_table(THD *thd, const char *db, const char *table_name);
 void close_temporary(TABLE *table, bool delete_table=1);
 bool rename_temporary_table(THD* thd, TABLE *table, const char *new_db,
 			    const char *table_name);
-void remove_db_from_cache(const my_string db);
+void remove_db_from_cache(const char *db);
 void flush_tables();
 bool remove_table_from_cache(THD *thd, const char *db, const char *table,
 			     bool return_if_owned_by_thd=0);
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index fe1f268e277..7ff5a02f05a 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2864,8 +2864,18 @@ static void mysql_rm_tmp_tables(void)
 ** and afterwards delete those marked unused.
 */
 
-void remove_db_from_cache(const my_string db)
+void remove_db_from_cache(const char *db)
 {
+  char name_buff[NAME_LEN+1];
+  if (db && lower_case_table_names)
+  {
+    /*
+      convert database to lower case for comparision.
+    */
+    strmake(name_buff, db, sizeof(name_buff)-1);
+    my_casedn_str(files_charset_info, name_buff);
+    db= name_buff;
+  }
   for (uint idx=0 ; idx < open_cache.records ; idx++)
   {
     TABLE *table=(TABLE*) hash_element(&open_cache,idx);