From e409d6f69c91a9f097802455dd61a2387e16d5f0 Mon Sep 17 00:00:00 2001 From: Mats Kindahl Date: Wed, 31 Mar 2010 16:05:33 +0200 Subject: 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 --- sql/sql_acl.cc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'sql/sql_acl.cc') diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 86f62d9bf72..dae6123c38f 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -24,13 +24,25 @@ in the relevant fields. Empty strings comes last. */ -#include "mysql_priv.h" +#include "sql_priv.h" +#include "sql_acl.h" // MYSQL_DB_FIELD_COUNT, ACL_ACCESS +#include "sql_base.h" // close_thread_tables +#include "key.h" // key_copy, key_cmp_if_same, key_restore +#include "sql_show.h" // append_identifier +#include "sql_table.h" // build_table_filename #include "hash_filo.h" +#include "sql_parse.h" // check_access +#include "sql_view.h" // VIEW_ANY_ACL +#include "records.h" // READ_RECORD, read_record_info, + // init_read_record, end_read_record +#include "rpl_filter.h" // rpl_filter #include #include #include "sp_head.h" #include "sp.h" #include "transaction.h" +#include "lock.h" // MYSQL_LOCK_IGNORE_TIMEOUT +#include "records.h" // init_read_record, end_read_record bool mysql_user_table_is_in_short_password_format= false; -- cgit v1.2.1