Bug#20363277: FIX #INCLUDE DEPENDENCIES IN FIELD.H AND SET_VAR.H

More cleanup of #includes. Make more self-contained,
remove unneccesary dependencies.

Author: jhauglid

sql/binlog.cc

@@ -34,6 +34,10 @@
 #include <m_ctype.h>				// For is_number
 #include <my_stacktrace.h>
 #include "mysqld_thd_manager.h"                 // Global_THD_manager
+
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 #include <pfs_transaction_provider.h>
 #include <mysql/psi/mysql_transaction.h>
 

sql/bootstrap.cc

@@ -22,6 +22,9 @@
 #include "sql_connect.h"         // close_connection
 #include "sql_parse.h"           // mysql_parse
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 static MYSQL_FILE *bootstrap_file= NULL;
 static int bootstrap_error= 0;
 

sql/bootstrap.h

@@ -17,9 +17,8 @@
 #define BOOTSTRAP_H
 
 #include "my_global.h"
-#include "my_thread.h"
-#include "pfs_file_provider.h"
-#include "mysql/psi/mysql_file.h"  // MYSQL_FILE
+
+typedef struct st_mysql_file MYSQL_FILE;
 
 /**
   Execute all commands from a file. Used by the mysql_install_db script to

sql/datadict.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 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
@@ -17,6 +17,8 @@
 #include "sql_class.h"
 #include "sql_table.h"
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
 
 /**
   Check type of .frm if we are not going to parse it.

sql/derror.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
@@ -28,6 +28,9 @@
 #include "sql_class.h"                          // THD
 #include "log.h"
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 static void init_myfunc_errs(void);
 
 

sql/des_key_file.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 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,9 @@
 #include "log.h"                // sql_print_error
 #include <m_ctype.h>
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 #ifdef HAVE_OPENSSL
 
 struct st_des_keyschedule des_keyschedule[10];

sql/discover.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 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
@@ -27,6 +27,9 @@
 #include <my_dir.h>
 #include "my_sys.h"
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 /**
   Read the contents of a .frm file.
 

sql/event_data_objects.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 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
@@ -13,8 +13,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#define MYSQL_LEX 1
-#include "my_global.h"                          /* NO_EMBEDDED_ACCESS_CHECKS */
+#include "event_data_objects.h"
+
 #include "sql_parse.h"                          // parse_sql
 #include "strfunc.h"                           // find_string_in_array
 #include "sql_db.h"                        // get_default_db_collation
@@ -25,8 +25,8 @@
 #include "auth_common.h"                   // EVENT_ACL, SUPER_ACL
 #include "sp.h"         // load_charset, load_collation
 #include "events.h"
-#include "event_data_objects.h"
 #include "event_db_repository.h"
+#include "event_parse_data.h"
 #include "sp_head.h"
 #include "sql_show.h"                // append_definer, append_identifier
 #include "log.h"

sql/event_data_objects.h

@@ -22,15 +22,21 @@
   @file event_data_objects.h
 */
 
-#include "event_parse_data.h"
-#include "thr_lock.h"                           /* thr_lock_type */
+#include "my_global.h"
+#include "m_string.h"                   // LEX_CSTRING
+#include "my_alloc.h"                   // MEM_ROOT
+#include "my_time.h"                    // my_time_t
+#include "mysql/mysql_lex_string.h"     // LEX_STRING
+
+#include "my_thread.h"
 
 class Field;
 class String;
 class THD;
 class Time_zone;
 struct TABLE;
 typedef ulonglong sql_mode_t;
+typedef struct st_mysql_lex_string LEX_STRING;
 
 void init_scheduler_psi_keys(void);
 

sql/event_db_repository.cc

@@ -14,8 +14,9 @@
    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"                           // close_thread_tables
 #include "event_db_repository.h"
+
+#include "sql_base.h"                           // close_thread_tables
 #include "key.h"                                // key_copy
 #include "sql_db.h"                        // get_default_db_collation
 #include "sql_time.h"                      // interval_type_to_name
@@ -24,6 +25,7 @@
 #include "records.h"          // init_read_record, end_read_record
 #include "sp_head.h"
 #include "event_data_objects.h"
+#include "event_parse_data.h"
 #include "events.h"
 #include "sql_show.h"
 #include "lock.h"                               // MYSQL_LOCK_IGNORE_TIMEOUT

sql/event_db_repository.h

@@ -2,7 +2,7 @@
 #define _EVENT_DB_REPOSITORY_H_
 
 /*
-   Copyright (c) 2006, 2011, 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,7 +18,14 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
+#include "my_global.h"
+#include "my_time.h"                            // my_time_t
+#include "thr_lock.h"                           // thr_lock_type
+#include "mysql/mysql_lex_string.h"             // LEX_STRING
+
+struct TABLE;
 struct TABLE_LIST;
+typedef struct st_mysql_lex_string LEX_STRING;
 
 /**
   @addtogroup Event_Scheduler

sql/event_queue.cc

@@ -14,6 +14,7 @@
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #include "event_queue.h"
+
 #include "event_data_objects.h"
 #include "event_db_repository.h"
 #include "events.h"

sql/event_queue.h

@@ -31,6 +31,7 @@
 #include "my_thread.h"                          // mysql_mutex_t
 
 #include "event_data_objects.h"
+#include "event_parse_data.h"
 #include "priority_queue.h"
 #include "malloc_allocator.h"
 

sql/event_scheduler.cc

@@ -14,6 +14,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "event_scheduler.h"
+
 #include "events.h"
 #include "event_data_objects.h"
 #include "event_queue.h"

sql/events.cc

@@ -14,10 +14,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
+#include "events.h"
+
 #include "sql_parse.h"                          // check_access
 #include "sql_base.h"                           // close_mysql_tables
 #include "sql_show.h"                           // append_definer
-#include "events.h"
 #include "sql_db.h"                          // check_db_dir_existence
 #include "sql_table.h"                       // write_bin_log
 #include "tztime.h"                             // struct Time_zone

sql/events.h

@@ -25,22 +25,12 @@
   A public interface of Events_Scheduler module.
 */
 
-#ifdef HAVE_PSI_INTERFACE
-extern PSI_mutex_key key_event_scheduler_LOCK_scheduler_state;
-extern PSI_cond_key key_event_scheduler_COND_state;
-extern PSI_thread_key key_thread_event_scheduler, key_thread_event_worker;
-#endif /* HAVE_PSI_INTERFACE */
-
-extern PSI_memory_key key_memory_event_basic_root;
-
-/* Always defined, for SHOW PROCESSLIST. */
-extern PSI_stage_info stage_waiting_on_empty_queue;
-extern PSI_stage_info stage_waiting_for_next_activation;
-extern PSI_stage_info stage_waiting_for_scheduler_to_stop;
-
+#include "my_global.h"
 #include "mysql/mysql_lex_string.h"             // LEX_STRING
 #include "my_time.h"                            /* interval_type */
 
+#include "my_thread.h"
+
 class Event_db_repository;
 class Event_parse_data;
 class Event_queue;
@@ -52,6 +42,19 @@ class THD;
 typedef struct charset_info_st CHARSET_INFO;
 typedef struct st_mysql_lex_string LEX_STRING;
 
+#ifdef HAVE_PSI_INTERFACE
+extern PSI_mutex_key key_event_scheduler_LOCK_scheduler_state;
+extern PSI_cond_key key_event_scheduler_COND_state;
+extern PSI_thread_key key_thread_event_scheduler, key_thread_event_worker;
+#endif /* HAVE_PSI_INTERFACE */
+
+extern PSI_memory_key key_memory_event_basic_root;
+
+/* Always defined, for SHOW PROCESSLIST. */
+extern PSI_stage_info stage_waiting_on_empty_queue;
+extern PSI_stage_info stage_waiting_for_next_activation;
+extern PSI_stage_info stage_waiting_for_scheduler_to_stop;
+
 int
 sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);
 

sql/field.cc

@@ -23,27 +23,25 @@
   This file implements classes defined in field.h
 */
 
-#include "sql_select.h"
-#include "rpl_rli.h"                            // Pull in Relay_log_info
-#include "rpl_slave.h"                          // Pull in rpl_master_has_bug()
-#include "strfunc.h"                            // find_type2, find_set
-#include "sql_time.h"                    // str_to_datetime_with_warn,
-                                         // str_to_time_with_warn,
-                                         // TIME_to_timestamp,
-                                         // make_time, make_date,
-                                         // make_truncated_value_warning
-#include "tztime.h"                      // struct Time_zone
+#include "field.h"
+
 #include "filesort.h"                    // change_double_for_sort
+#include "item_timefunc.h"               // Item_func_now_local
 #include "log_event.h"                   // class Table_map_log_event
-#include <m_ctype.h>
-#include <errno.h>
+#include "rpl_rli.h"                     // Relay_log_info
+#include "rpl_slave.h"                   // rpl_master_has_bug
+#include "sql_class.h"                   // THD
 #include "sql_join_buffer.h"             // CACHE_FIELD
-#include "sql_base.h"
-#include "item_timefunc.h"               // Item_func_now_local
+#include "sql_time.h"                    // str_to_datetime_with_warn
+#include "strfunc.h"                     // find_type2
+#include "tztime.h"                      // Time_zone
+
+#include <algorithm>
 
 using std::max;
 using std::min;
 
+
 // Maximum allowed exponent value for converting string to decimal
 #define MAX_EXPONENT 1024
 

sql/field.h

@@ -16,16 +16,23 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include "mysqld.h"                             /* system_charset_info */
-#include "table.h"                              /* TABLE */
-#include "sql_string.h"                         /* String */
-#include "my_decimal.h"                         /* my_decimal */
-#include "sql_error.h"                          /* Sql_condition */
-#include "mysql_version.h"                      /* FRM_VER */
-#include "mysqld_error.h"
-#include "binary_log_funcs.h"
-#include "my_time.h"                            /* my_time_binary_length */
-#include "my_compare.h"                         /* portable_sizeof_char_ptr */
+#include "my_global.h"
+
+#include "my_compare.h"                         // portable_sizeof_char_ptr
+#include "my_time.h"                            // MYSQL_TIME_NOTE_TRUNCATED
+#include "binary_log_funcs.h"                   // my_time_binary_length
+#include "mysqld.h"                             // system_charset_info
+#include "mysqld_error.h"                       // ER_*
+#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 Protocol;
+class Relay_log_info;
+class Send_field;
+
 
 /*
 
@@ -78,12 +85,6 @@ Field (abstract)
 */
 
 
-class Send_field;
-class Protocol;
-class Create_field;
-class Relay_log_info;
-class Field;
-
 enum enum_check_fields
 {
   CHECK_FIELD_IGNORE,
@@ -167,6 +168,8 @@ enum type_conversion_status
 #define my_charset_numeric      my_charset_latin1
 #define MY_REPERTOIRE_NUMERIC   MY_REPERTOIRE_ASCII
 
+#define FRM_VER_TRUE_VARCHAR (FRM_VER+4) /* 10 */
+
 struct st_cache_field;
 type_conversion_status field_conv(Field *to,Field *from);
 

sql/filesort.cc

@@ -38,6 +38,9 @@
 #include "log.h"
 #include "item_sum.h"                   // Item_sum
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 #include <algorithm>
 #include <utility>
 using std::max;

sql/ha_partition.cc

@@ -61,12 +61,14 @@
 #include "sql_show.h"                        // append_identifier
 #include "sql_admin.h"                       // SQL_ADMIN_MSG_TEXT_SIZE
 #include "myisam.h"                          // TT_FOR_UPGRADE
-
 #include "debug_sync.h"
 #ifndef DBUG_OFF
 #include "sql_test.h"                        // print_where
 #endif
 
+#include "pfs_file_provider.h"
+#include "mysql/psi/mysql_file.h"
+
 using std::min;
 using std::max;