diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 06e38546f43..23302e1847e 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -31,7 +31,7 @@ #include "sql_base.h" // close_mysql_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 "sql_table.h" // write_bin_log #include "hash_filo.h" #include "sql_parse.h" // check_access #include "sql_view.h" // VIEW_ANY_ACL diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index e077073c2df..3252e403226 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -27,7 +27,6 @@ #include "sql_delete.h" #include "sql_cache.h" // query_cache_* #include "sql_base.h" // open_temprary_table -#include "sql_table.h" // build_table_filename #include "lock.h" // unlock_table_name #include "sql_view.h" // check_key_in_view, mysql_frm_type #include "sql_parse.h" // mysql_init_select diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 17b297f63bd..b795f5d7f22 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -24,7 +24,7 @@ #include "unireg.h" #include "sql_rename.h" #include "sql_cache.h" // query_cache_* -#include "sql_table.h" // build_table_filename +#include "sql_table.h" // write_bin_log #include "sql_view.h" // mysql_frm_type, mysql_rename_view #include "sql_trigger.h" #include "lock.h" // MYSQL_OPEN_SKIP_TEMPORARY diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index 7c62516d52b..334dd318643 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -96,7 +96,6 @@ enum charset_enum {IN_SYSTEM_CHARSET, IN_FS_CHARSET}; static const char *bool_values[3]= {"OFF", "ON", 0}; TYPELIB bool_typelib={ array_elements(bool_values)-1, "", bool_values, 0 }; -extern const char *encrypt_algorithm_names[]; /** A small wrapper class to pass getopt arguments as a pair