From bcae0d9bab24165bc58090187ba0a51babe0e8ac Mon Sep 17 00:00:00 2001 From: Konstantin Osipov Date: Wed, 2 Dec 2009 18:22:15 +0300 Subject: Backport of: ---------------------------------------------------------- revno: 2630.10.1 committer: Konstantin Osipov 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. --- sql/field.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sql/field.h') diff --git a/sql/field.h b/sql/field.h index fb6ca34e88e..3dd18b4ffaa 100644 --- a/sql/field.h +++ b/sql/field.h @@ -478,7 +478,6 @@ public: } /* Hash value */ virtual void hash(ulong *nr, ulong *nr2); - friend bool reopen_table(THD *,struct st_table *,bool); friend int cre_myisam(char * name, register TABLE *form, uint options, ulonglong auto_increment_value); friend class Copy_field; -- cgit v1.2.1