Bug#21656153: REDUCE HEADER FILE DEPENDENCIES IN MYSQLD.H

Remove unneccessary header dependencies from mysqld.h
Remove declarations from mysqld.h which have no defintions.
Remove declarations from mysqld.h where they can be made
static in mysqld.cc instead.
Remove performance schema keys for mutexes/rwlocks/files that no
longer exist.

Author: jhauglid

libmysqld/lib_sql.cc

@@ -51,14 +51,6 @@ extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
 static my_bool emb_read_query_result(MYSQL *mysql);
 
 
-void unireg_clear(int exit_code)
-{
-  DBUG_ENTER("unireg_clear");
-  clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */
-  my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
-  DBUG_VOID_RETURN;
-}
-
 /*
   Wrapper error handler for embedded server to call client/server error 
   handler based on whether thread is in client/server context

sql/auth/sql_auth_cache.cc

@@ -22,6 +22,7 @@
 #include "field.h"              // Field
 #include "item_func.h"          // mqh_used
 #include "log.h"                // sql_print_warning
+#include "mysqld.h"             // my_localhost
 #include "psi_memory_key.h"     // key_memory_acl_mem
 #include "records.h"            // READ_RECORD
 #include "sql_authentication.h" // sha256_password_plugin_name

sql/auth/sql_auth_cache.h

@@ -18,6 +18,7 @@
 
 #include "my_global.h"
 #include "my_sys.h"                     // wild_many, wild_one, wild_prefix
+#include "m_string.h"                   // LEX_CSTRING
 #include "mysql_com.h"                  // SCRAMBLE_LENGTH
 #include "mysql_time.h"                 // MYSQL_TIME
 #include "prealloced_array.h"           // Prealloced_array

sql/auth/sql_authorization.cc

@@ -27,6 +27,7 @@
 #include "log.h"                        /* sql_print_warning */
 #include "sql_class.h"
 #include "derror.h"
+#include "mysqld.h"
 
 #include "sql_update.h"
 #include "auth_internal.h"

sql/auth/sql_user.cc

@@ -29,6 +29,7 @@
 #include "tztime.h"
 #include "crypt_genhash_impl.h"         /* CRYPT_MAX_PASSWORD_SIZE */
 #include "derror.h"                     /* ER_THD */
+#include "mysqld.h"
 
 /**
   Auxiliary function for constructing a  user list string.

sql/derror.cc

@@ -25,6 +25,8 @@
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"
 
+CHARSET_INFO *error_message_charset_info;
+
 static const char *ERRMSG_FILE = "errmsg.sys";
 static const int NUM_SECTIONS=
   sizeof(errmsg_section_start) / sizeof(errmsg_section_start[0]);

sql/derror.h

@@ -22,6 +22,12 @@
 #endif
 
 class THD;
+typedef struct charset_info_st CHARSET_INFO;
+
+/**
+  Character set of the buildin error messages loaded from errmsg.sys.
+*/
+extern CHARSET_INFO *error_message_charset_info;
 
 class MY_LOCALE_ERRMSGS
 {

sql/hash_filo.h

@@ -23,7 +23,10 @@
 #define  HASH_FILO_H
 
 #include "hash.h"        /* my_hash_get_key, my_hash_free_key, HASH */
-#include "mysqld.h"      /* key_hash_filo_lock */
+
+#ifdef HAVE_PSI_INTERFACE
+extern PSI_mutex_key key_hash_filo_lock;
+#endif // HAVE_PSI_INTERFACE
 
 struct hash_filo_element
 {

sql/hostname.cc

@@ -28,6 +28,7 @@
 #include "hostname.h"
 #include "hash_filo.h"
 #include <m_ctype.h>
+#include "mysqld.h"                             // specialflag
 #include "log.h"                                // sql_print_warning,
                                                 // sql_print_information
 #include "psi_memory_key.h"

sql/hostname.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 #include "my_global.h"                          /* uint */
 #include "hash_filo.h"
+#include "mysql_com.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

sql/init.cc

@@ -25,6 +25,7 @@
 #include "my_sys.h"
 #include "mysqld.h"                    // connection_events_loop_aborted(), ...
 #include "my_time.h"                   // my_init_time
+#include "m_string.h"                  // my_stpcpy
 #include <m_ctype.h>
 
 #ifdef _WIN32