diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
| commit | e409d6f69c91a9f097802455dd61a2387e16d5f0 (patch) | |
| tree | 19f32879e77ada23d733f35173a25f410d655ebe /sql/sql_base.cc | |
| parent | 36430c53f98931028ce318bed7f2834a4ff30195 (diff) | |
| download | mariadb-git-e409d6f69c91a9f097802455dd61a2387e16d5f0.tar.gz | |
WL#5030: Split and remove mysql_priv.h
This patch:
- Moves all definitions from the mysql_priv.h file into
header files for the component where the variable is
defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 651787a7969..51ab56083fc 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -16,8 +16,29 @@ /* Basic functions needed by many modules */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "unireg.h" #include "debug_sync.h" +#include "sql_base.h" // setup_table_map +#include "lock.h" // broadcast_refresh, mysql_lock_remove, + // mysql_unlock_tables, + // mysql_lock_have_duplicate +#include "sql_show.h" // append_identifier +#include "strfunc.h" // find_type +#include "parse_file.h" // sql_parse_prepare, File_parser +#include "sql_view.h" // mysql_frm_type, mysql_make_view, VIEW_ANY_ACL +#include "sql_parse.h" // check_table_access +#include "sql_insert.h" // kill_delayed_threads +#include "sql_acl.h" // *_ACL, check_grant_all_columns, + // check_column_grant_in_table_ref, + // get_column_grant +#include "sql_partition.h" // ALTER_PARTITION_PARAM_TYPE +#include "sql_derived.h" // mysql_derived_prepare, + // mysql_handle_derived, + // mysql_derived_filling +#include "sql_handler.h" // mysql_ha_flush +#include "sql_partition.h" // ALTER_PARTITION_PARAM_TYPE +#include "log_event.h" // Query_log_event #include "sql_select.h" #include "sp_head.h" #include "sp.h" @@ -29,6 +50,7 @@ #include <my_dir.h> #include <hash.h> #include "rpl_filter.h" +#include "sql_table.h" // build_table_filename #ifdef __WIN__ #include <io.h> #endif |