Backport of:

----------------------------------------------------------
revno: 2630.10.1
committer: Konstantin Osipov <konstantin@mysql.com>
branch nick: mysql-6.0-lock-tables-tidyup
timestamp: Wed 2008-06-11 15:49:58 +0400
message:
  WL#3726, review fixes.
  Now that we have metadata locks, we don't need to keep a crippled
  TABLE instance in the table cache to indicate that a table is locked.
  Remove all code that used this technique. Instead, rely on metadata
  locks and use the standard open_table() and close_thread_table()
  to manipulate with the table cache tables.
  Removes a list of functions that have become unused (see the comment
  for sql_base.cc for details).
  Under LOCK TABLES, keep a TABLE_LIST instance for each table
  that may be temporarily closed. For that, implement an own class for
  LOCK TABLES mode, Locked_tables_list.

This is a pre-requisite patch for WL#4144.
This is not exactly a backport: there is no new 
online ALTER table in Celosia, so the old alter table
code was changed to work with the new table cache API.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index b5c51601faf..1b61a96d7ff 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1956,8 +1956,8 @@ bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db)
 
   /*
     Step7: drop the old database.
-    remove_db_from_cache(olddb) and query_cache_invalidate(olddb)
-    are done inside mysql_rm_db(), no needs to execute them again.
+    query_cache_invalidate(olddb) is done inside mysql_rm_db(), no need
+    to execute them again.
     mysql_rm_db() also "unuses" if we drop the current database.
   */
   error= mysql_rm_db(thd, old_db->str, 0, 1);