Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

Patch #11: Fix -Wunused-parameter warnings in sql*, part 1.

Author: jhauglid

sql/dd/dd_upgrade.cc

@@ -1113,7 +1113,7 @@ static bool create_unlinked_view(THD *thd,
   TABLE_LIST *saved_query_tables= thd->lex->query_tables;
   SQL_I_List<Sroutine_hash_entry> saved_sroutines_list;
   // For creation of view without column information.
-  SELECT_LEX select(NULL, NULL, NULL, NULL, NULL, NULL);
+  SELECT_LEX select(nullptr, nullptr);
 
   // Backup
   thd->lex->select_lex= &select;

sql/dd/impl/sdi_utils.h

@@ -88,7 +88,7 @@ template <typename CONDITION_HANDLER_CLOS>
 class Closure_error_handler : public Internal_error_handler
 {
   CONDITION_HANDLER_CLOS *m_ch;
-  bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
+  bool handle_condition(THD*, uint sql_errno, const char* sqlstate,
                         Sql_condition::enum_severity_level *level,
                         const char* msg)
   {

sql/handler.h

@@ -5336,7 +5336,7 @@ class handler :public Sql_alloc
     @param  [in]      key_info      Array of KEY objects describing table
                                     indexes.
     @param  [in]      key_count     Number of indexes in the table.
-    @param  [in,out]  table         dd::Table object describing the table
+    @param  [in,out]  table_obj     dd::Table object describing the table
                                     to be created. Implicit columns and
                                     indexes are to be added to this object.
                                     Adjusted table description will be
@@ -5352,7 +5352,7 @@ class handler :public Sql_alloc
                                *create_list MY_ATTRIBUTE((unused)),
                                const KEY *key_info MY_ATTRIBUTE((unused)),
                                uint key_count MY_ATTRIBUTE((unused)),
-                               dd::Table *table MY_ATTRIBUTE((unused)))
+                               dd::Table *table_obj MY_ATTRIBUTE((unused)))
   { return 0; }
 
   virtual bool set_ha_share_ref(Handler_share **arg_ha_share)

sql/item.cc

@@ -9076,7 +9076,6 @@ void Item_insert_value::print(String *str, enum_query_type query_type)
   Find index of Field object which will be appropriate for item
   representing field of row being changed in trigger.
 
-  @param thd     current thread context
   @param table_triggers     Table_trigger_field_support instance. Do not use
                             TABLE::triggers as it might be not initialized at
                             the moment.
@@ -9095,15 +9094,14 @@ void Item_insert_value::print(String *str, enum_query_type query_type)
     Another difference is that the field is not marked in read_set/write_set.
 */
 
-void Item_trigger_field::setup_field(THD *thd,
-                                     Table_trigger_field_support *table_triggers,
+void Item_trigger_field::setup_field(Table_trigger_field_support *table_triggers,
                                      GRANT_INFO *table_grant_info)
 {
   /*
     Try to find field by its name and if it will be found
     set field_idx properly.
   */
-  (void) find_field_in_table(thd, table_triggers->get_subject_table(),
+  (void) find_field_in_table(table_triggers->get_subject_table(),
                              field_name, strlen(field_name),
                              0, &field_idx);
   triggers= table_triggers;

sql/item.h

@@ -5406,8 +5406,7 @@ class Item_trigger_field final : public Item_field,
      field_idx((uint)-1), original_privilege(priv),
      want_privilege(priv), table_grants(NULL), read_only (ro)
   {}
-  void setup_field(THD *thd,
-                   Table_trigger_field_support *table_triggers,
+  void setup_field(Table_trigger_field_support *table_triggers,
                    GRANT_INFO *table_grant_info);
   enum Type type() const override { return TRIGGER_FIELD_ITEM; }
   bool eq(const Item *item, bool binary_cmp) const override;

sql/parse_tree_nodes.cc

@@ -1120,7 +1120,7 @@ bool PT_table_factor_joined_table::contextualize(Parse_context *pc)
     return true;
   value= m_joined_table->value;
 
-  if (outer_select->end_nested_join(pc->thd) == NULL)
+  if (outer_select->end_nested_join() == nullptr)
     return true;
 
   return false;

sql/sp_head.cc

@@ -1866,7 +1866,7 @@ bool sp_head::setup_trigger_fields(THD *thd,
     for (Item_trigger_field *f= trig_field_list->first; f;
          f= f->next_trg_field)
     {
-      f->setup_field(thd, tfs, subject_table_grant);
+      f->setup_field(tfs, subject_table_grant);
 
       if (need_fix_fields &&
           !f->fixed &&

sql/sp_instr.cc

@@ -607,7 +607,7 @@ LEX *sp_lex_instr::parse_expr(THD *thd, sp_head *sp)
            trg_fld;
            trg_fld= trg_fld->next_trg_field)
       {
-        trg_fld->setup_field(thd, sp->m_trg_list->get_trigger_field_support(),
+        trg_fld->setup_field(sp->m_trg_list->get_trigger_field_support(),
                              t->get_subject_table_grant());
       }
 

sql/sql_alter_instance.cc

@@ -35,16 +35,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
   @brief
   Log current command to binlog
 
-  @param [IN] is_transactional - Whether statement is transactional or not
-
   @returns false on success,
            true on error
 
   In case of failure, appropriate error is logged.
 */
 
 bool
-Alter_instance::log_to_binlog(bool is_transactional)
+Alter_instance::log_to_binlog()
 {
   bool res= false;
   if (!m_thd->lex->no_write_to_binlog)
@@ -101,7 +99,7 @@ Rotate_innodb_master_key::execute()
     return true;
   }
 
-  if (log_to_binlog(false))
+  if (log_to_binlog())
   {
     /*
       Though we failed to write to binlog,

sql/sql_alter_instance.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, 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
@@ -29,7 +29,7 @@ class Alter_instance
     : m_thd(thd)
   {}
   virtual bool execute()= 0;
-  bool log_to_binlog(bool is_transactional);
+  bool log_to_binlog();
   virtual ~Alter_instance() {};
 };
 

sql/sql_analyse.cc

@@ -1082,7 +1082,7 @@ int collect_real(double *element, element_count count MY_ATTRIBUTE((unused)),
 } // collect_real
 
 
-int collect_decimal(uchar *element, element_count count,
+int collect_decimal(uchar *element, element_count,
                     TREE_INFO *info)
 {
   char buff[DECIMAL_MAX_STR_LENGTH + 1];