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 | fa3b2dcb838a05f5c07b78c2fc518018c473a47f (patch) | |
| tree | b055b8d1c4471f9f8daad623d14e1af7b793f04c /sql/sys_vars.cc | |
| parent | 199f2ce47eb508aa62e9b2fcf80c6536cb14f4f5 (diff) | |
| parent | fe0828b3b8193e086abe740572c9b0cb2b7da671 (diff) | |
| download | mariadb-git-fa3b2dcb838a05f5c07b78c2fc518018c473a47f.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/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 8ca3d2a46fa..49d272af8d3 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -27,6 +27,9 @@ (for example in storage/myisam/ha_myisam.cc) ! */ +#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_priv.h" +#include "sql_class.h" // set_var.h: THD #include "sys_vars.h" #include "events.h" @@ -34,12 +37,26 @@ #include "slave.h" #include "rpl_mi.h" #include "transaction.h" +#include "mysqld.h" +#include "lock.h" +#include "sql_time.h" // known_date_time_formats +#include "sql_acl.h" // SUPER_ACL, + // mysql_user_table_is_in_short_password_format +#include "derror.h" // read_texts +#include "sql_base.h" // close_cached_tables #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE #include "../storage/perfschema/pfs_server.h" #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */ /* + This forward declaration is needed because including sql_base.h + causes further includes. [TODO] Eliminate this forward declaration + and include a file with the prototype instead. +*/ +extern void close_thread_tables(THD *thd); + +/* The rule for this file: everything should be 'static'. When a sys_var variable or a function from this file is - in very rare cases - needed elsewhere it should be explicitly declared 'export' here to show that it's |