Bug #24710065: SPLIT MY_GLOBAL.H

Run include-what-you-use limited to adding my_loglevel.h and then re-sorting
the #includes (and nothing else); then remove my_loglevel.h from my_global.h.

Change-Id: I64f29306d5d19e97c3ba5215994d867163522c67

Author: Steinar H. Gunderson

client/mysql.cc

@@ -30,17 +30,19 @@
  *
  **/
 
-#include "client_priv.h"
-#include "my_default.h"
 #include <m_ctype.h>
-#include <stdarg.h>
 #include <mf_wcomp.h>                  // wild_prefix, wild_one, wild_any
 #include <my_dir.h>
-#include "my_readline.h"
 #include <signal.h>
+#include <stdarg.h>
 #include <violite.h>
-#include "prealloced_array.h"
+
+#include "client_priv.h"
+#include "my_default.h"
+#include "my_loglevel.h"
+#include "my_readline.h"
 #include "mysql/service_my_snprintf.h"
+#include "prealloced_array.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -61,18 +63,20 @@
 
 #if defined(_WIN32)
 #include <conio.h>
+
 // Not using syslog but EventLog on Win32, so a dummy facility is enough.
 #define LOG_USER 0
 #else
-#include <syslog.h>
 #include <readline.h>
+#include <syslog.h>
+
 #define HAVE_READLINE
 #define USE_POPEN
 #endif
 
-#include <algorithm>
-#include <sql_common.h>
 #include <mysqld_error.h>
+#include <sql_common.h>
+#include <algorithm>
 
 using std::min;
 using std::max;
@@ -99,9 +103,10 @@ static char *server_version= NULL;
 #define cmp_database(cs,A,B) strcmp((A),(B))
 #endif
 
-#include "completion_hash.h"
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 
+#include "completion_hash.h"
+
 #define PROMPT_CHAR '\\'
 #define DEFAULT_DELIMITER ";"
 
@@ -1808,6 +1813,7 @@ static struct my_option my_long_options[] =
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR_ALLOC,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include "sslopt-longopts.h"
+
   {"table", 't', "Output in table format.", &output_tables,
    &output_tables, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"tee", OPT_TEE,
@@ -2114,6 +2120,7 @@ get_one_option(int optid, const struct my_option *opt MY_ATTRIBUTE((unused)),
 #endif
     break;
 #include <sslopt-case.h>
+
   case 'V':
     usage(1);
     exit(0);

include/my_global.h

@@ -55,7 +55,6 @@
 #include "my_double2ulonglong.h"
 #include "my_inttypes.h"
 #include "my_io.h"
-#include "my_loglevel.h"
 #include "my_macros.h"
 #include "my_sharedlib.h"
 #include "my_shm_defaults.h"

libmysql/client_settings.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2016, 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
@@ -19,6 +19,9 @@
 #error You have already included an client_settings.h and it should not be included twice
 #endif /* CLIENT_SETTINGS_INCLUDED */
 
+#include "my_macros.h"
+#include "mysql.h"
+
 extern uint		mysql_port;
 extern char *	mysql_unix_port;
 

libmysqld/lib_sql.cc

@@ -18,15 +18,18 @@
   This code was modified by the MySQL team
 */
 
-#include "my_global.h"
-#include "mysql.h"
-#include "errmsg.h"
-#include "embedded_priv.h"
-#include "client_settings.h"
-#include "my_default.h"
+#include <algorithm>
 
+#include "../storage/perfschema/pfs_server.h"
+#include "client_settings.h"
 #include "current_thd.h"
+#include "embedded_priv.h"
+#include "errmsg.h"
 #include "log.h"
+#include "my_default.h"
+#include "my_global.h"
+#include "my_loglevel.h"
+#include "mysql.h"
 #include "mysqld.h"
 #include "mysqld_embedded.h"
 #include "mysqld_thd_manager.h"
@@ -39,10 +42,6 @@
 #include "sql_table.h"
 #include "sql_thd_internal_api.h"
 #include "tztime.h"
-#include "../storage/perfschema/pfs_server.h"
-
-#include "sql_db.h"     // mysql_change_db
-#include <algorithm>
 
 using std::min;
 using std::max;

mysys_ssl/my_default.cc

@@ -46,6 +46,7 @@
 #include "m_string.h"
 #include "my_default.h"
 #include "my_default_priv.h"
+#include "my_loglevel.h"
 #include "my_psi_config.h"
 #include "mysql/psi/mysql_file.h"
 #include "mysql/service_my_snprintf.h"

mysys_ssl/my_getopt.cc

@@ -17,16 +17,17 @@
   @file mysys_ssl/my_getopt.cc
 */
 
-#include <my_global.h>
-#include <m_string.h>
-#include <stdlib.h>
-#include <mysys_err.h>
-#include <my_getopt.h>
 #include <errno.h>
-#include <m_string.h>
-#include "my_default.h"
 #include <m_ctype.h>
+#include <m_string.h>
+#include <my_getopt.h>
+#include <my_global.h>
+#include <mysys_err.h>
+#include <stdlib.h>
+
 #include "../mysys/mysys_priv.h"
+#include "my_default.h"
+#include "my_loglevel.h"
 #include "mysql/service_mysql_alloc.h"
 #include "typelib.h"
 

rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -39,6 +39,7 @@
 #include "expr_parser.h"
 #include "m_string.h" // needed by writer.h, but has to be included after expr_parser.h
 #include "my_global.h"
+#include "my_loglevel.h"
 #include "mysqlx_crud.h"
 #include "mysqlx_error.h"
 #include "mysqlx_protocol.h"

sql-common/client.cc

@@ -34,6 +34,7 @@
 #include <my_global.h>
 
 #include "hash.h"
+#include "my_loglevel.h"
 #include "my_psi_config.h"
 #include "mysql.h"
 #include "mysql/client_authentication.h"

sql/log.h

@@ -25,6 +25,7 @@
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_global.h"
+#include "my_loglevel.h"
 #include "my_psi_config.h"
 #include "my_sys.h"
 #include "my_thread_local.h"

sql/log_event.cc

@@ -38,6 +38,7 @@
 #include "my_byteorder.h"
 #include "my_compiler.h"
 #include "my_decimal.h"        // my_decimal
+#include "my_loglevel.h"
 #include "my_time.h"           // MAX_DATE_STRING_REP_LENGTH
 #include "mysql.h"             // MYSQL_OPT_MAX_ALLOWED_PACKET
 #include "mysql/service_my_snprintf.h" // my_snprintf
@@ -69,24 +70,24 @@
 #include "enum_query_type.h"
 #include "field.h"
 #include "handler.h"
-#include "item_func.h"         // Item_func_set_user_var
 #include "item.h"
+#include "item_func.h"         // Item_func_set_user_var
 #include "key.h"
 #include "log.h"               // Log_throttle
 #include "mdl.h"
 #include "my_base.h"
 #include "my_command.h"
 #include "my_dir.h"            // my_dir
 #include "my_sqlcommand.h"
-#include "mysqld_error.h"
-#include "mysqld.h"            // lower_case_table_names server_uuid ...
 #include "mysql/plugin.h"
 #include "mysql/psi/mysql_cond.h"
 #include "mysql/psi/mysql_file.h"
 #include "mysql/psi/mysql_stage.h"
 #include "mysql/psi/mysql_statement.h"
 #include "mysql/psi/mysql_transaction.h"
 #include "mysql/psi/psi_statement.h"
+#include "mysqld.h"            // lower_case_table_names server_uuid ...
+#include "mysqld_error.h"
 #include "pfs_file_provider.h"
 #include "prealloced_array.h"
 #include "protocol.h"

sql/mysqld.cc

@@ -341,6 +341,7 @@
 #include "my_decimal.h"
 #include "my_default.h"                 // print_defaults
 #include "my_dir.h"
+#include "my_loglevel.h"
 #include "my_regex.h"
 #include "my_stacktrace.h"              // my_set_exception_pointers
 #include "my_time.h"
@@ -370,8 +371,8 @@
 #include "mysql_time.h"
 #include "mysql_version.h"
 #include "mysqld_daemon.h"
-#include "mysqld_error.h"
 #include "mysqld_embedded.h"            // IWYU pragma: keep
+#include "mysqld_error.h"
 #include "mysqld_thd_manager.h"         // Global_THD_manager
 #include "mysys_err.h"                  // EXIT_OUT_OF_MEMORY
 #include "opt_costconstantcache.h"      // delete_optimizer_cost_module
@@ -449,24 +450,22 @@
 #include "shared_memory_connection.h"
 #endif
 
-#include <algorithm>
-#include <atomic>
-#include <functional>
-#include <list>
-#include <set>
-#include <string>
-#include <vector>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <fenv.h>
 #include <limits.h>
+#ifdef HAVE_GRP_H
+#include <grp.h>
+#endif
 #ifndef _WIN32
 #include <netdb.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stddef.h>
@@ -476,29 +475,27 @@
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <algorithm>
-#include <functional>
-#include <new>
-#include <string>
-#include <vector>
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 #ifdef _WIN32
 #include <crtdbg.h>
 #include <process.h>
 #endif
 
+#include <algorithm>
+#include <atomic>
+#include <functional>
+#include <list>
+#include <set>
+#include <string>
+#include <vector>
+#include <new>
+
 #ifndef EMBEDDED_LIBRARY
 #include "srv_session.h"
 #endif

sql/persisted_variable.cc

@@ -32,6 +32,7 @@
 #include "my_dbug.h"
 #include "my_default.h"                 // check_file_permissions
 #include "my_getopt.h"
+#include "my_loglevel.h"
 #include "my_sys.h"
 #include "my_thread.h"
 #include "mysql/plugin.h"

sql/persistent_dynamic_loader.cc

@@ -33,15 +33,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02111-1307  USA */
 #include "handler.h"
 #include "key.h"
 #include "log.h" // error_log_print
-#include "mdl.h"
 #include "m_string.h"
+#include "mdl.h"
 #include "my_base.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_global.h"
+#include "my_loglevel.h"
+#include "my_sys.h"
 #include "mysql/components/service_implementation.h"
 #include "mysqld_error.h"
-#include "my_sys.h"
 #include "records.h"
 #include "sql_base.h"
 #include "sql_class.h"

sql/protocol_classic.cc

@@ -222,6 +222,7 @@
 #include "my_byteorder.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
+#include "my_loglevel.h"
 #include "my_sys.h"
 #include "my_time.h"
 #include "mysql/com_data.h"

sql/rpl_reporting.h

@@ -23,6 +23,7 @@
 
 #include "my_compiler.h"
 #include "my_global.h"
+#include "my_loglevel.h"
 #include "my_sys.h"                   // my_time
 #include "mysql/psi/mysql_mutex.h"
 

sql/rpl_rli.h

@@ -16,19 +16,19 @@
 #ifndef RPL_RLI_H
 #define RPL_RLI_H
 
+#include <sys/types.h>
+#include <time.h>
 #include <atomic>
 #include <string>
 #include <vector>
 
-#include <sys/types.h>
-#include <time.h>
-
 #include "binlog.h"            // MYSQL_BIN_LOG
 #include "handler.h"
 #include "m_string.h"
 #include "my_bitmap.h"
 #include "my_dbug.h"
 #include "my_global.h"
+#include "my_loglevel.h"
 #include "my_psi_config.h"
 #include "my_sys.h"
 #include "mysql/psi/mysql_cond.h"