Bug#24488219: INCLUDE WHAT YOU USE

Run IWYU on everything under sql/*, except sql/gis/*.
(Some manual cleanup was needed.)

Change-Id: I46806e50f9d9e43092144d7e454e3fd3d840a83a

Author: Steinar H. Gunderson

include/mysql/components/services/psi_mutex_bits.h

@@ -28,6 +28,7 @@
   Other compilers, like gcc, optimize these dependencies by default.
 */
 
+#include "my_inttypes.h"
 #include "my_macros.h"
 
 C_MODE_START

include/mysql/psi/psi_abi_mutex_v1.h.pp

@@ -21,6 +21,7 @@
 #include "my_psi_config.h"
 #include "my_sharedlib.h"
 #include "mysql/components/services/psi_mutex_bits.h"
+#include "my_inttypes.h"
 #include "my_macros.h"
 typedef unsigned int PSI_mutex_key;
 struct PSI_mutex_info_v1

include/mysql/service_security_context.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2017, 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
@@ -24,6 +24,8 @@
   @sa security_context_service_st
 */
 
+#include "mysql/plugin.h"
+
 #ifdef __cplusplus
 class Security_context;
 /** an opaque class reference hiding the actual security context object. */

include/mysql/services.h.pp

@@ -532,6 +532,118 @@
 } *transaction_write_set_service;
 Transaction_write_set* get_transaction_write_set(unsigned long m_thread_id);
 #include <mysql/service_security_context.h>
+#include "mysql/plugin.h"
+#include "status_var.h"
+enum enum_mysql_show_type
+{
+  SHOW_UNDEF, SHOW_BOOL,
+  SHOW_INT,
+  SHOW_LONG,
+  SHOW_LONGLONG,
+  SHOW_CHAR, SHOW_CHAR_PTR,
+  SHOW_ARRAY, SHOW_FUNC, SHOW_DOUBLE
+};
+enum enum_mysql_show_scope
+{
+  SHOW_SCOPE_UNDEF,
+  SHOW_SCOPE_GLOBAL
+};
+struct st_mysql_show_var
+{
+  const char *name;
+  char *value;
+  enum enum_mysql_show_type type;
+  enum enum_mysql_show_scope scope;
+};
+typedef int (*mysql_show_var_func)(void*, struct st_mysql_show_var*, char *);
+typedef void * MYSQL_PLUGIN;
+struct st_mysql_xid {
+  long formatID;
+  long gtrid_length;
+  long bqual_length;
+  char data[128];
+};
+typedef struct st_mysql_xid MYSQL_XID;
+struct st_mysql_sys_var;
+struct st_mysql_value;
+typedef int (*mysql_var_check_func)(void* thd,
+                                    struct st_mysql_sys_var *var,
+                                    void *save, struct st_mysql_value *value);
+typedef void (*mysql_var_update_func)(void* thd,
+                                      struct st_mysql_sys_var *var,
+                                      void *var_ptr, const void *save);
+struct st_mysql_plugin
+{
+  int type;
+  void *info;
+  const char *name;
+  const char *author;
+  const char *descr;
+  int license;
+  int (*init)(MYSQL_PLUGIN);
+  int (*check_uninstall)(MYSQL_PLUGIN);
+  int (*deinit)(MYSQL_PLUGIN);
+  unsigned int version;
+  struct st_mysql_show_var *status_vars;
+  struct st_mysql_sys_var **system_vars;
+  void * __reserved1;
+  unsigned long flags;
+};
+struct st_mysql_daemon
+{
+  int interface_version;
+};
+struct st_mysql_information_schema
+{
+  int interface_version;
+};
+struct st_mysql_storage_engine
+{
+  int interface_version;
+};
+struct handlerton;
+ struct Mysql_replication {
+   int interface_version;
+ };
+struct st_mysql_value
+{
+  int (*value_type)(struct st_mysql_value *);
+  const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
+  int (*val_real)(struct st_mysql_value *, double *realbuf);
+  int (*val_int)(struct st_mysql_value *, long long *intbuf);
+  int (*is_unsigned)(struct st_mysql_value *);
+};
+int thd_in_lock_tables(const void* thd);
+int thd_tablespace_op(const void* thd);
+long long thd_test_options(const void* thd, long long test_options);
+int thd_sql_command(const void* thd);
+const char *set_thd_proc_info(void* thd, const char *info,
+                              const char *calling_func,
+                              const char *calling_file,
+                              const unsigned int calling_line);
+void **thd_ha_data(const void* thd, const struct handlerton *hton);
+void thd_storage_lock_wait(void* thd, long long value);
+int thd_tx_isolation(const void* thd);
+int thd_tx_is_read_only(const void* thd);
+void* thd_tx_arbitrate(void* requestor, void* holder);
+int thd_tx_priority(const void* thd);
+int thd_tx_is_dd_trx(const void* thd);
+char *thd_security_context(void* thd, char *buffer, size_t length,
+                           size_t max_query_len);
+void thd_inc_row_count(void* thd);
+int thd_allow_batch(void* thd);
+void thd_mark_transaction_to_rollback(void* thd, int all);
+int mysql_tmpfile(const char *prefix);
+int thd_killed(const void* thd);
+void thd_set_kill_status(const void* thd);
+void thd_binlog_pos(const void* thd,
+                    const char **file_var,
+                    unsigned long long *pos_var);
+unsigned long thd_get_thread_id(const void* thd);
+void thd_get_xid(const void* thd, MYSQL_XID *xid);
+void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
+void thd_set_ha_data(void* thd, const struct handlerton *hton,
+                     const void *ha_data);
 typedef char my_svc_bool;
 extern struct security_context_service_st {
   my_svc_bool (*thd_get_security_context)(void*, void* *out_ctx);

plugin/connection_control/security_context_wrapper.cc

@@ -14,10 +14,11 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 
-#include <sql_class.h>                      /* THD, Security context */
-#include <sql_acl.h>                        /* SUPER_ACL */
 #include <mysql/service_security_context.h> /* Security context service */
+#include <sql_acl.h>                        /* SUPER_ACL */
+#include <sql_class.h>                      /* THD, Security context */
 
+#include "auth_acls.h"
 #include "security_context_wrapper.h"
 
 namespace connection_control

plugin/version_token/version_token.cc

@@ -18,22 +18,22 @@
 #include <errmsg.h>
 #include <locking_service.h>
 #include <m_string.h>
+#include <mysql/components/my_service.h>
+#include <mysql/components/services/dynamic_privilege.h>
 #include <mysql/plugin_audit.h>
 #include <mysql/psi/mysql_memory.h>
 #include <mysql/psi/mysql_rwlock.h>
 #include <mysql/service_locking.h>
-#include <mysql/components/my_service.h>
-#include <mysql/components/services/dynamic_privilege.h>
 #include <sql_class.h>
 #include <sys/types.h>
-
 #include <algorithm>
 #include <atomic>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "auth_acls.h"
 #include "lex_string.h"
 #include "map_helpers.h"
 #include "my_compiler.h"

sql/abstract_query_plan.cc

@@ -31,7 +31,7 @@
 #include "sql_opt_exec_shared.h"
 #include "sql_optimizer.h"    // JOIN
 #include "table.h"
-#include "temp_table_param.h"
+#include "thr_malloc.h"
 
 namespace AQP
 {

sql/aggregate_check.cc

@@ -34,16 +34,21 @@
 #include "my_base.h"
 #include "my_dbug.h"
 #include "my_sys.h"
+#include "mysql/service_my_snprintf.h"
 #include "mysqld_error.h"
 #include "opt_trace.h"
 #include "opt_trace_context.h"
+#include "parse_tree_nodes.h"
+#include "sql_array.h"
 #include "sql_base.h"
 #include "sql_class.h"
 #include "sql_const.h"
 #include "sql_lex.h"
 #include "sql_list.h"
+#include "sql_parse.h"
 #include "table.h"
 #include "template_utils.h"
+#include "window.h"
 
 /**
   @addtogroup AGGREGATE_CHECKS

sql/aggregate_check.h

@@ -456,7 +456,9 @@ VE2 are NULL then VE3 must be NULL, which makes the dependency NULL-friendly.
 #include "my_dbug.h"
 #include "my_inttypes.h"
 #include "my_table_map.h"
+#include "mysql/udf_registration_types.h"
 #include "sql_alloc.h"           // Sql_alloc
+#include "sql_lex.h"
 
 class Opt_trace_context;
 class Opt_trace_object;

sql/auth/auth_common.h

@@ -16,34 +16,29 @@
 #ifndef AUTH_COMMON_INCLUDED
 #define AUTH_COMMON_INCLUDED
 
-#include "my_config.h"
-
+#include <mysql/components/my_service.h>
+#include <mysql/components/service.h>
+#include <mysql/components/services/dynamic_privilege.h>
 #include <stddef.h>
 #include <sys/types.h>
+#include <functional>
 #include <set>
 #include <utility>
 #include <vector>
 
-#include "auth_acls.h"                          /* ACL information */
+#include "dynamic_privileges_impl.h"
 #include "lex_string.h"
-#include "m_string.h"
 #include "my_command.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"
-#include "sql_string.h"                         /* String */
 #include "template_utils.h"
 #include "thr_malloc.h"
-#include <mysql/components/service.h>
-#include <mysql/components/my_service.h>
-#include <mysql/components/services/dynamic_privilege.h>
-#include "dynamic_privileges_impl.h"
-
-#include <functional>
 
 /* Forward Declarations */
 class Alter_info;
 class Field_iterator_table_ref;
 class LEX_COLUMN;
+class String;
 class THD;
 template <class T> class List;
 

sql/auth/dynamic_privilege_table.cc

@@ -12,16 +12,39 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-#include "sql_base.h"
-#include "records.h"
-#include "auth_internal.h"
+#include <string.h>
+#include <string>
+#include <unordered_map>
+
 #include "auth_common.h"
-#include "sql_auth_cache.h"
-#include "mysqld_error.h"
+#include "auth_internal.h"
 #include "current_thd.h"
-#include "sql_class.h"
 #include "dynamic_privilege_table.h"
-#include <string>
+#include "field.h"
+#include "handler.h"
+#include "lex_string.h"
+#include "m_ctype.h"
+#include "my_base.h"
+#include "my_dbug.h"
+#include "my_inttypes.h"
+#include "my_sys.h"
+#include "mysql/components/my_service.h"
+#include "mysql/components/service.h"
+#include "mysql/components/services/dynamic_privilege.h"
+#include "mysql/components/services/registry.h"
+#include "mysql/mysql_lex_string.h"
+#include "mysql/psi/psi_base.h"
+#include "mysql/service_plugin_registry.h"
+#include "mysql/udf_registration_types.h"
+#include "mysqld_error.h"
+#include "records.h"
+#include "sql_auth_cache.h"
+#include "sql_const.h"
+#include "sql_security_ctx.h"
+#include "sql_servers.h"
+#include "table.h"
+
+class THD;
 
 #define MYSQL_DYNAMIC_PRIV_FIELD_USER  0
 #define MYSQL_DYNAMIC_PRIV_FIELD_HOST  1

sql/auth/dynamic_privilege_table.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2016, 2017, 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
@@ -15,13 +15,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 #ifndef DYNAMIC_PRIVILEGE_TABLE_H
 #define DYNAMIC_PRIVILEGE_TABLE_H
 
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
 #include <auth/auth_common.h>
 #include <m_string.h>
 #include <algorithm>
 #include <functional>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "key.h"
+
+class THD;
+struct TABLE;
+struct TABLE_LIST;
 
 typedef std::unordered_set<std::string >
   Dynamic_privilege_register;

sql/auth/dynamic_privileges_impl.cc

@@ -12,19 +12,29 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
-#include <mysql/components/service_implementation.h>
-#include <auth/auth_common.h>
 #include <auth/dynamic_privilege_table.h>
 #include <auth/sql_security_ctx.h>
+#include <ctype.h>
 #include <mysql/components/my_service.h>
+#include <mysql/components/service_implementation.h>
 #include <mysql/components/services/dynamic_privilege.h>
-#include <stddef.h>
-#include "dynamic_privileges_impl.h"
 #include <mysql/service_plugin_registry.h>
-#include "current_thd.h"
+#include <stddef.h>
+#include <string>
+#include <unordered_map>
+#include <utility>
+
 #include "auth/sql_auth_cache.h"
+#include "current_thd.h"
+#include "dynamic_privileges_impl.h"
+#include "m_string.h"
+#include "mysql/components/service.h"
+#include "mysql/components/services/registry.h"
+#include "mysql/psi/psi_base.h"
 #include "sql_thd_internal_api.h"  // create_thd
 
+class THD;
+
 /**
   This helper class is used for either selecting a previous THD or
   if it's missing, create a new THD.