WL#5275: Cleanup include files for deleted functions

Author: roylyseng

sql/item_subselect.cc

@@ -28,7 +28,6 @@
 #include "opt_trace.h"           // OPT_TRACE_TRANSFORM
 #include "parse_tree_nodes.h"    // PT_subselect
 #include "sql_class.h"           // THD
-#include "sql_derived.h"         // mysql_derived_create
 #include "sql_join_buffer.h"     // JOIN_CACHE
 #include "sql_lex.h"             // st_select_lex
 #include "sql_optimizer.h"       // JOIN

sql/sql_base.cc

@@ -28,9 +28,6 @@
 #include "auth_common.h" // *_ACL, check_grant_all_columns,
                          // check_column_grant_in_table_ref,
                          // get_column_grant
-#include "sql_derived.h" // mysql_derived_prepare,
-                         // mysql_handle_derived,
-                         // mysql_derived_filling
 #include "sql_handler.h" // mysql_ha_flush
 #include "partition_info.h"                     // partition_info
 #include "log_event.h"                          // Query_log_event

sql/sql_base.h

@@ -66,8 +66,7 @@ typedef struct st_lock_param_type ALTER_PARTITION_PARAM_TYPE;
 /**
   This flag is used in function get_all_tables() which fills
   I_S tables with data which are retrieved from frm files and storage engine.
-  The flag means that we need to open a view using
-  open_normal_and_derived_tables() function.
+  The flag means that we need to open a view.
 */
 #define OPEN_VIEW_FULL         OPEN_VIEW_ONLY*2
 /**
@@ -287,7 +286,7 @@ bool lock_table_names(THD *thd, TABLE_LIST *table_list,
                       uint flags);
 bool open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags,
                  Prelocking_strategy *prelocking_strategy);
-/* open_and_lock_tables with optional derived handling */
+/* open_and_lock_tables */
 bool open_and_lock_tables(THD *thd, TABLE_LIST *tables, uint flags,
                           Prelocking_strategy *prelocking_strategy);
 /* simple open_and_lock_tables for single table */
@@ -469,7 +468,7 @@ inline TABLE *open_n_lock_single_table(THD *thd, TABLE_LIST *table_l,
 }
 
 
-/* open_and_lock_tables with derived handling */
+// open_and_lock_tables with default prelocking strategy
 inline bool open_and_lock_tables(THD *thd, TABLE_LIST *tables, uint flags)
 {
   DML_prelocking_strategy prelocking_strategy;

sql/sql_delete.cc

@@ -26,7 +26,7 @@
 #include "opt_explain.h"              // Modification_plan
 #include "opt_trace.h"                // Opt_trace_object
 #include "records.h"                  // READ_RECORD
-#include "sql_base.h"                 // open_normal_and_derived_tables
+#include "sql_base.h"                 // open_tables_for_query
 #include "sql_optimizer.h"            // optimize_cond
 #include "sql_resolver.h"             // setup_order
 #include "sql_select.h"               // free_underlaid_joins

sql/sql_executor.cc

@@ -32,7 +32,6 @@
 #include "log.h"              // sql_print_error
 #include "opt_trace.h"        // Opt_trace_object
 #include "sql_base.h"         // fill_record
-#include "sql_derived.h"      // mysql_derived_materialize
 #include "sql_join_buffer.h"  // st_cache_field
 #include "sql_optimizer.h"    // JOIN
 #include "sql_show.h"         // get_schema_tables_result

sql/sql_optimizer.cc

@@ -34,7 +34,6 @@
 #include "opt_explain.h"         // join_type_str
 #include "opt_trace.h"           // Opt_trace_object
 #include "sql_base.h"            // init_ftfuncs
-#include "sql_derived.h"         // mysql_derived_optimize
 #include "sql_join_buffer.h"     // JOIN_CACHE
 #include "sql_parse.h"           // check_stack_overrun
 #include "sql_planner.h"         // calculate_condition_filter

sql/sql_show.cc

@@ -38,7 +38,6 @@
 #include "sql_base.h"                       // close_thread_tables
 #include "sql_class.h"                      // THD
 #include "sql_db.h"                         // check_db_dir_existence
-#include "sql_derived.h"                    // mysql_derived_prepare
 #include "sql_optimizer.h"                  // JOIN
 #include "sql_parse.h"                      // command_name
 #include "sql_plugin.h"                     // PLUGIN_IS_DELTED

sql/sql_update.cc

@@ -30,7 +30,7 @@
 #include "opt_explain.h"              // Modification_plan
 #include "opt_trace.h"                // Opt_trace_object
 #include "records.h"                  // READ_RECORD
-#include "sql_base.h"                 // setup_fields_with_no_wrap
+#include "sql_base.h"                 // open_tables_for_query
 #include "sql_optimizer.h"            // build_equal_items
 #include "sql_resolver.h"             // setup_order
 #include "sql_select.h"               // free_underlaid_joins

sql/table.cc

@@ -29,7 +29,6 @@
 #include "partition_info.h"              // partition_info
 #include "sql_base.h"                    // OPEN_VIEW_ONLY
 #include "sql_class.h"                   // THD
-#include "sql_derived.h"                 // mysql_handle_single_derived
 #include "sql_parse.h"                   // check_stack_overrun
 #include "sql_partition.h"               // mysql_unpack_partition
 #include "sql_plugin.h"                  // plugin_unlock