Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

Patch #9: Fix -Wunused-parameter warnings in opt*

Author: jhauglid

sql/handler.h

@@ -4901,7 +4901,9 @@ class handler :public Sql_alloc
           the old schema and table name in this method for some reason it
           has to use ha_alter_info object to figure it out.
  */
- virtual void notify_table_changed(Alter_inplace_info *ha_alter_info) { };
+ virtual void
+ notify_table_changed(Alter_inplace_info *ha_alter_info MY_ATTRIBUTE((unused)))
+ { };
 
 public:
  /* End of On-line/in-place ALTER TABLE interface. */
@@ -5210,7 +5212,7 @@ class handler :public Sql_alloc
             to data-dictionary only if storage engine supports atomic DDL
             (i.e. has HTON_SUPPORTS_ATOMIC_DDL flag set).
   */
-  virtual int truncate(dd::Table *table_def)
+  virtual int truncate(dd::Table *table_def MY_ATTRIBUTE((unused)))
   { return HA_ERR_WRONG_COMMAND; }
   virtual int optimize(THD*, HA_CHECK_OPT*)
   { return HA_ADMIN_NOT_IMPLEMENTED; }
@@ -5327,10 +5329,14 @@ class handler :public Sql_alloc
     @retval  0      Success.
     @retval  non-0  Error.
   */
-  virtual int get_extra_columns_and_keys(const HA_CREATE_INFO *create_info,
-                                         const List<Create_field> *create_list,
-                                         const KEY *key_info, uint key_count,
-                                         dd::Table *table)
+  virtual int
+    get_extra_columns_and_keys(const HA_CREATE_INFO
+                               *create_info MY_ATTRIBUTE((unused)),
+                               const List<Create_field>
+                               *create_list MY_ATTRIBUTE((unused)),
+                               const KEY *key_info MY_ATTRIBUTE((unused)),
+                               uint key_count MY_ATTRIBUTE((unused)),
+                               dd::Table *table MY_ATTRIBUTE((unused)))
   { return 0; }
 
   virtual bool set_ha_share_ref(Handler_share **arg_ha_share)

sql/item.cc

@@ -2559,7 +2559,7 @@ void Item_ident_for_show::make_field(Send_field *tmp_field)
   tmp_field->field= false;
 }
 
-bool Item_ident_for_show::fix_fields(THD *thd, Item **ref)
+bool Item_ident_for_show::fix_fields(THD*, Item**)
 {
   maybe_null= field->maybe_null();
   decimals= field->decimals();

sql/item_cmpfunc.cc

@@ -6118,7 +6118,7 @@ float Item_func_isnull::get_filtering_effect(table_map filter_for_table,
                                                   COND_FILTER_EQUALITY);
 }
 
-bool Item_func_isnull::resolve_type(THD *thd)
+bool Item_func_isnull::resolve_type(THD*)
 {
   max_length= 1;
   maybe_null= false;

sql/item_func.h

@@ -2245,7 +2245,7 @@ class Item_func_can_access_trigger : public Item_int_func
   {}
   longlong val_int();
   const char *func_name() const { return "can_access_trigger"; }
-  bool resolve_type(THD *thd)
+  bool resolve_type(THD*)
   {
     max_length= 4;
     maybe_null= true;
@@ -2262,7 +2262,7 @@ class Item_func_can_access_routine : public Item_int_func
   {}
   longlong val_int();
   const char *func_name() const { return "can_access_routine"; }
-  bool resolve_type(THD *thd)
+  bool resolve_type(THD*)
   {
     max_length= 4;
     maybe_null= true;
@@ -2278,7 +2278,7 @@ class Item_func_can_access_event : public Item_int_func
   {}
   longlong val_int();
   const char *func_name() const { return "can_access_event"; }
-  bool resolve_type(THD *thd)
+  bool resolve_type(THD*)
   {
     max_length= 21;
     maybe_null= true;

sql/item_json_func.h

@@ -742,7 +742,7 @@ class Item_func_json_pretty final :public Item_str_func
 
   const char *func_name() const override { return "json_pretty"; }
 
-  bool resolve_type(THD *thd) override
+  bool resolve_type(THD*) override
   {
     set_data_type_string(MAX_BLOB_WIDTH, &my_charset_utf8mb4_bin);
     return false;

sql/item_sum.h

@@ -795,7 +795,7 @@ class Item_sum_int :public Item_sum_num
   { set_data_type_longlong(); }
   Item_sum_int(THD *thd, Item_sum_int *item) :Item_sum_num(thd, item)
   { set_data_type_longlong(); }
-  bool resolve_type(THD *thd) override
+  bool resolve_type(THD*) override
   {
     maybe_null= false;
     for (uint i= 0; i < arg_count; i++)
@@ -896,7 +896,7 @@ class Item_sum_count :public Item_sum_int
   {
     return has_with_distinct() ? COUNT_DISTINCT_FUNC : COUNT_FUNC;
   }
-  bool resolve_type(THD *thd) override
+  bool resolve_type(THD*) override
   {
     maybe_null= false;
     null_value= FALSE;

sql/opt_explain_json.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 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
@@ -251,10 +251,10 @@ class context : public Explain_context
 
     This function is to be overloaded by subquery_ctx.
   */
-  virtual void set_child(context *child) {}
+  virtual void set_child(context*) {}
 
   /// associate CTX_UNION_RESULT node with CTX_UNION node
-  virtual void set_union_result(union_result_ctx *ctx) { DBUG_ASSERT(0); }
+  virtual void set_union_result(union_result_ctx*) { DBUG_ASSERT(0); }
 
   /**
     Append a subquery node to the specified list of the unit node
@@ -265,8 +265,10 @@ class context : public Explain_context
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_subquery(subquery_list_enum subquery_type,
-                            subquery_ctx *ctx) { DBUG_ASSERT(0);return true; }
+  virtual bool
+  add_subquery(subquery_list_enum subquery_type MY_ATTRIBUTE((unused)),
+               subquery_ctx *ctx MY_ATTRIBUTE((unused)))
+  { DBUG_ASSERT(0);return true; }
   /**
     Format nested loop join subtree (if any) to JSON formatter
 
@@ -275,7 +277,8 @@ class context : public Explain_context
     @retval false               Ok
     @retval true                Error
   */
-  virtual bool format_nested_loop(Opt_trace_context *json)
+  virtual bool
+  format_nested_loop(Opt_trace_context *json MY_ATTRIBUTE((unused)))
   { DBUG_ASSERT(0); return true; }
 
   /**
@@ -286,15 +289,17 @@ class context : public Explain_context
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_join_tab(joinable_ctx *ctx) { DBUG_ASSERT(0);return true; }
+  virtual bool add_join_tab(joinable_ctx *ctx MY_ATTRIBUTE((unused)))
+  { DBUG_ASSERT(0);return true; }
 
   /**
     Set nested ORDER BY/GROUP BY/DISTINCT node to @c ctx
 
     @retval false               Ok
     @retval true                Error
   */
-  virtual void set_sort(sort_ctx *ctx) { DBUG_ASSERT(0); }
+  virtual void set_sort(sort_ctx *ctx MY_ATTRIBUTE((unused)))
+  { DBUG_ASSERT(0); }
 
   /**
     Add a query specification node to the CTX_UNION node
@@ -304,7 +309,8 @@ class context : public Explain_context
     @retval false           Ok
     @retval true            Error
   */
-  virtual bool add_query_spec(context *ctx) { DBUG_ASSERT(0); return true; }
+  virtual bool add_query_spec(context *ctx MY_ATTRIBUTE((unused)))
+  { DBUG_ASSERT(0); return true; }
 
   /**
     Try to associate a derived subquery node with this or underlying node
@@ -315,7 +321,7 @@ class context : public Explain_context
     @retval false       Can't associate: this node or its child nodes are not
                         derived from the subquery
   */
-  virtual bool find_and_set_derived(context *subquery)
+  virtual bool find_and_set_derived(context *subquery MY_ATTRIBUTE((unused)))
   {
     DBUG_ASSERT(0);
     return false;
@@ -332,21 +338,22 @@ class context : public Explain_context
        0   subqusery were added
        1   error occured
   */
-  virtual int add_where_subquery(subquery_ctx *ctx,
-                                  SELECT_LEX_UNIT *subquery)
+  virtual int
+  add_where_subquery(subquery_ctx *ctx MY_ATTRIBUTE((unused)),
+                     SELECT_LEX_UNIT *subquery MY_ATTRIBUTE((unused)))
   {
     DBUG_ASSERT(0);
     return false;
   }
 
   /// Helper function to format output for derived subquery if any
-  virtual bool format_derived(Opt_trace_context *json) { return false; }
+  virtual bool format_derived(Opt_trace_context*) { return false; }
 
   /// Helper function to format output for associated WHERE subqueries if any
-  virtual bool format_where(Opt_trace_context *json) { return false; }
+  virtual bool format_where(Opt_trace_context*) { return false; }
 
   /// Helper function to format output for HAVING, ORDER/GROUP BY subqueries
-  virtual bool format_unit(Opt_trace_context *json) { return false; }
+  virtual bool format_unit(Opt_trace_context*) { return false; }
 };
 
 
@@ -582,7 +589,7 @@ class table_base_ctx : virtual public context, virtual public qep_row
   virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj);
 
 public:
-  virtual size_t id(bool hide)
+  virtual size_t id(bool)
   {
     return col_id.is_empty() ? 0 : col_id.value;
   }
@@ -878,7 +885,7 @@ class message_ctx : public joinable_ctx,
   }
 
   virtual int add_where_subquery(subquery_ctx *ctx,
-                                  SELECT_LEX_UNIT *subquery)
+                                 SELECT_LEX_UNIT*)
   {
     return where_subqueries.push_back(ctx);
   }
@@ -1608,7 +1615,7 @@ class union_ctx : public unit_ctx
   {}
 
 private:
-  virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
+  virtual bool format_body(Opt_trace_context *json, Opt_trace_object*)
   {
     if (union_result)
       return (union_result->format(json)) || format_unit(json);