diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-19 16:09:44 +0400 |
| commit | ee09f9721165ff04c645516651a4ae3892ce7231 (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /sql/sql_rename.cc | |
| parent | 54f3f65601142d7d942c4a81e953ae5439d0014f (diff) | |
| parent | 2283e1b510998ea904f118b0da50986ec4047de2 (diff) | |
| download | mariadb-git-ee09f9721165ff04c645516651a4ae3892ce7231.tar.gz | |
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge.
Conflicts:
Text conflict in sql/sql_priv.h
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 009563319cd..d387010141c 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -17,9 +17,18 @@ Atomic rename of table; RENAME TABLE t1 to t2, tmp to t1 [,...] */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" +#include "sql_rename.h" +#include "sql_cache.h" // query_cache_* +#include "sql_table.h" // build_table_filename +#include "sql_view.h" // mysql_frm_type, mysql_rename_view #include "sql_trigger.h" - +#include "lock.h" // wait_if_global_read_lock, lock_table_names, + // unlock_table_names, + // start_waiting_global_read_lock +#include "sql_base.h" // tdc_remove_table +#include "sql_handler.h" // mysql_ha_rm_tables static TABLE_LIST *rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error); |