Bug#22455022: REMOVE EXTRA #INCLUDES FROM SQL/ HEADERS

Another round of sql/ header simplifications.
Do not #include headers that are not needed.
Use forward declarations if possible.

Gives fewer depedencies and faster compilation.

Author: jhauglid

plugin/innodb_memcached/daemon_memcached/daemon/memcached_mysql.cc

@@ -1,6 +1,6 @@
 /***********************************************************************
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 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 the
@@ -28,6 +28,7 @@ Created 04/12/2011 Jimmy Yang
 #include <stdlib.h>
 #include <ctype.h>
 #include <mysql_version.h>
+#include "plugin.h"
 #include "sql_plugin.h"
 
 /** Configuration info passed to memcached, including

sql/aggregate_check.h

@@ -1,7 +1,7 @@
 #ifndef AGGREGATE_CHECK_INCLUDED
 #define AGGREGATE_CHECK_INCLUDED
 
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 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
@@ -447,11 +447,15 @@ VE2 are NULL then VE3 must be NULL, which makes the dependency NULL-friendly.
 */
 
 #include "my_global.h"
-#include "mem_root_array.h"
-#include "opt_trace.h"
-#include "item_cmpfunc.h"
-#include "item_sum.h"
+
+#include "item_cmpfunc.h"        // Item_func_any_value
+#include "item_sum.h"            // Item_sum
+#include "mem_root_array.h"      // Mem_root_array
+#include "sql_alloc.h"           // Sql_alloc
+
 struct st_mem_root;
+class Opt_trace_context;
+class Opt_trace_object;
 class SELECT_LEX;
 struct TABLE_LIST;
 

sql/auth/sql_authorization.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
@@ -29,6 +29,7 @@
 #include "derror.h"
 #include "mysqld.h"
 
+#include "error_handler.h"
 #include "sql_update.h"
 #include "auth_internal.h"
 #include "sql_auth_cache.h"

sql/current_thd.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 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 published by
@@ -18,7 +18,6 @@
 
 #include "my_global.h"
 #include "my_thread_local.h"
-#include "my_dbug.h"
 
 class THD;
 

sql/dynamic_ids.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 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
@@ -17,6 +17,9 @@
 
 #include "dynamic_ids.h"
 
+#include "m_string.h"        // my_strtok_r
+#include "sql_string.h"      // String
+
 Server_ids::Server_ids()
   : dynamic_ids(PSI_NOT_INSTRUMENTED)
 {

sql/dynamic_ids.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 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
@@ -14,13 +14,13 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #ifndef DYNAMIC_ID_H
-
 #define DYNAMIC_ID_H
 
-#include <my_sys.h>
-#include <sql_string.h>
+#include "my_global.h"
 #include "prealloced_array.h"
 
+class String;
+
 class Server_ids
 {
 public:

sql/field.h

@@ -27,7 +27,6 @@
 #include "sql_error.h"                          // Sql_condition
 #include "sql_string.h"                         // String
 #include "table.h"                              // TABLE
-#include "mysql_version.h"                      // FRM_VER
 
 class Create_field;
 class Json_dom;

sql/filesort.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 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
@@ -43,6 +43,7 @@
 #include "json_dom.h"                   // Json_wrapper
 #include "psi_memory_key.h"
 #include "template_utils.h"
+#include "error_handler.h"
 
 #include "pfs_file_provider.h"
 #include "mysql/psi/mysql_file.h"

sql/filesort.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 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
@@ -18,7 +18,7 @@
 
 #include "my_global.h"                          /* uint, uchar */
 #include "my_base.h"                            /* ha_rows */
-#include "sql_list.h"                           /* Sql_alloc */
+#include "sql_alloc.h"                          /* Sql_alloc */
 class THD;
 struct TABLE;
 struct st_sort_field;

sql/filesort_utils.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 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
@@ -17,16 +17,17 @@
 #define FILESORT_UTILS_INCLUDED
 
 #include "my_global.h"
-#include "my_base.h"
-#include "sql_array.h"
-#include "my_sys.h"
-#include "mysql/service_mysql_alloc.h"
 
-#include <algorithm>
+#include "my_base.h"                   // ha_rows
+#include "mysql/service_mysql_alloc.h" // my_free
+#include "sql_array.h"                 // Bounds_checked_array
+
 #include <utility>
 
 class Cost_model_table;
 class Sort_param;
+
+
 /*
   Calculate cost of merge sort
 

sql/handler.cc

@@ -30,6 +30,7 @@
 #include "dd_table_share.h"           // open_table_def
 #include "debug_sync.h"               // DEBUG_SYNC
 #include "derror.h"                   // ER_DEFAULT
+#include "error_handler.h"            // Internal_error_handler
 #include "lock.h"                     // MYSQL_LOCK
 #include "log.h"                      // sql_print_error
 #include "log_event.h"                // Write_rows_log_event

sql/item.cc

@@ -21,6 +21,7 @@
 #include "auth_common.h"     // get_column_grant
 #include "current_thd.h"
 #include "derror.h"          // ER_THD
+#include "error_handler.h"   // Internal_error_handler
 #include "item_cmpfunc.h"    // COND_EQUAL
 #include "item_create.h"     // create_temporal_literal
 #include "item_func.h"       // item_func_sleep_init

sql/item_cmpfunc.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
@@ -29,6 +29,7 @@
 #include "item_sum.h"           // Item_sum_hybrid
 #include "item_json_func.h"     // json_value, get_json_atom_wrapper
 #include "mysqld.h"             // log_10
+#include "opt_trace.h"          // Opt_trace_object
 #include "parse_tree_helpers.h" // PT_item_list
 #include "sql_class.h"          // THD
 #include "sql_optimizer.h"      // JOIN

sql/item_func.cc

@@ -28,6 +28,7 @@
 #include "current_thd.h"
 #include "debug_sync.h"          // DEBUG_SYNC
 #include "derror.h"              // ER_THD
+#include "error_handler.h"       // Internal_error_handler
 #include "item_cmpfunc.h"        // get_datetime_value
 #include "item_strfunc.h"        // Item_func_geohash
 #include <mysql/service_thd_wait.h>

sql/item_strfunc.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 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
@@ -40,6 +40,7 @@
 #include "mysqld.h"                  // LOCK_des_key_file
 #include "sha1.h"                    // SHA1_HASH_SIZE
 #include "auth_common.h"             // check_password_policy
+#include "derror.h"                  // ER_THD
 #include "des_key_file.h"            // st_des_keyblock
 #include "password.h"                // my_make_scrambled_password
 #include "spatial.h"                 // Geometry

sql/item_timefunc.cc

@@ -28,6 +28,7 @@
 #include "item_timefunc.h"
 
 #include "current_thd.h"
+#include "derror.h"          // ER_THD
 #include "sql_class.h"       // THD
 #include "sql_locale.h"      // my_locale_en_US
 #include "sql_time.h"        // make_truncated_value_warning

sql/json_binary.h

@@ -1,7 +1,7 @@
 #ifndef JSON_BINARY_INCLUDED
 #define JSON_BINARY_INCLUDED
 
-/* Copyright (c) 2015, 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 published by
@@ -134,10 +134,10 @@
 */
 
 #include "my_global.h"
-#include "sql_string.h"                         // String
 #include "binary_log_types.h"                   // enum_field_types
 
 class Json_dom;
+class String;
 
 namespace json_binary
 {

sql/json_path.h

@@ -1,7 +1,7 @@
 #ifndef SQL_JSON_PATH_INCLUDED
 #define SQL_JSON_PATH_INCLUDED
 
-/* Copyright (c) 2015, 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 published by
@@ -26,11 +26,11 @@
 
 #include "my_global.h"
 #include "prealloced_array.h"                   // Prealloced_array
-#include "sql_string.h"                         // String
 
 #include <string>
 
 class Json_string;
+class String;
 
 enum enum_json_path_leg_type
 {

sql/keycaches.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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
@@ -16,6 +16,7 @@
 #include "keycaches.h"
 #include "../mysys/mysys_priv.h"
 #include "template_utils.h"
+#include "m_string.h"
 
 
 /****************************************************************************

sql/keycaches.h

@@ -1,7 +1,7 @@
 #ifndef KEYCACHES_INCLUDED
 #define KEYCACHES_INCLUDED
 
-/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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
@@ -16,10 +16,16 @@
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
+#include "my_global.h"
+
 #include "sql_list.h"
-#include <keycache.h>
+#include "keycache.h"
+#include "mysql/mysql_lex_string.h"
 #include "mysql/service_mysql_alloc.h"
 
+typedef struct st_mysql_lex_string LEX_STRING;
+
+
 extern "C"
 {
   extern PSI_memory_key key_memory_NAMED_ILINK_name;

sql/locking_service.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 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 published by
@@ -16,6 +16,7 @@
 #include "locking_service.h"
 
 #include "current_thd.h"   // current_thd
+#include "error_handler.h" // Internal_error_handler
 #include "mdl.h"           // MDL_request_list
 #include "sql_class.h"     // THD
 

sql/log.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
@@ -28,6 +28,7 @@
 
 #include "current_thd.h"    // current_thd
 #include "derror.h"         // ER_DEFAULT
+#include "error_handler.h"  // Internal_error_handler
 #include "mysqld.h"         // opt_log_syslog_enable
 #include "psi_memory_key.h" // key_memory_File_query_log_name
 #include "sql_audit.h"      // mysql_audit_general_log

sql/log_event.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 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
@@ -30,6 +30,7 @@
 #include "mysql.h"             // MYSQL_OPT_MAX_ALLOWED_PACKET
 #include "my_decimal.h"        // my_decimal
 #include "my_time.h"           // MAX_DATE_STRING_REP_LENGTH
+#include "derror.h"            // ER_THD
 
 #ifdef MYSQL_CLIENT
 #include "mysqlbinlog.h"

sql/log_event.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
@@ -29,6 +29,7 @@
 #define _log_event_h
 
 #include "my_global.h"
+#include "m_string.h"                // native_strncasecmp
 #include "my_bitmap.h"               // MY_BITMAP
 #include "binary_log.h"              // binary_log
 #include "rpl_utility.h"             // Hash_slave_rows

sql/mysqld.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 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,9 +19,10 @@
 #include "my_global.h"
 #include "mysql_com.h"                     // SERVER_VERSION_LENGTH
 #include "my_atomic.h"                     // my_atomic_load32
+#include "my_sqlcommand.h"                 // SQLCOM_END
+#include "my_sys.h"                        // MY_TMPDIR
 #include "my_thread.h"                     // my_thread_attr_t
 #include "my_thread_local.h"               // my_get_thread_local
-#include "sql_cmd.h"                       // SQLCOM_END
 #include "sql_const.h"                     // UUID_LENGTH
 #include "atomic_class.h"                  /* Atomic_int32 */