Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

Patch #13: Fix -Wunused-parameter warnings in sql*, part 3.

Author: jhauglid

sql/sys_vars.cc

@@ -133,7 +133,7 @@ static Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref,
                                const char *name,
                                Name_resolution_context *context);
 static void open_table_error(THD *thd, TABLE_SHARE *share,
-                             int error, int db_errno, int errarg);
+                             int error, int db_errno);
 
 inline bool is_system_table_name(const char *name, size_t length);
 
@@ -2539,7 +2539,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share,
   delete handler_file;
   my_hash_free(&share->name_hash);
 
-  open_table_error(thd, share, error, my_errno(), errarg);
+  open_table_error(thd, share, error, my_errno());
   DBUG_RETURN(error);
 } /*open_binary_frm*/
 
@@ -3400,7 +3400,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
 
  err:
   if (! error_reported)
-    open_table_error(thd, share, error, my_errno(), 0);
+    open_table_error(thd, share, error, my_errno());
   delete outparam->file;
   if (outparam->part_info)
     free_items(outparam->part_info->item_free_list);
@@ -3512,7 +3512,7 @@ void free_blob_buffers_and_reset(TABLE *table, uint32 size)
 	/* error message when opening a table defintion */
 
 static void open_table_error(THD *thd, TABLE_SHARE *share,
-                             int error, int db_errno, int errarg)
+                             int error, int db_errno)
 {
   int err_no;
   char buff[FN_REFLEN];
@@ -7253,7 +7253,7 @@ bool TABLE_LIST::update_derived_keys(Field *field, Item **values,
   See TABLE_LIST::generate_keys.
 */
 
-static int Derived_key_comp(Derived_key *e1, Derived_key *e2, void *arg)
+static int Derived_key_comp(Derived_key *e1, Derived_key *e2, void*)
 {
   /* Move entries for tables with greater table bit to the end. */
   return ((e1->referenced_by < e2->referenced_by) ? -1 :
@@ -7740,7 +7740,6 @@ st_lex_user::alloc(THD *thd, LEX_STRING *user_arg, LEX_STRING *host_arg)
   @param  share                     TABLE_SHARE object to be filled.
   @param  frm_context               FRM_context for structures removed from
                                     TABLE_SHARE
-  @param  db                        database name
   @param  table                     table name
   @param  is_fix_view_cols_and_deps Flag to indicate that we are recreating view
                                     to create view dependency entry in DD tables
@@ -7751,7 +7750,6 @@ st_lex_user::alloc(THD *thd, LEX_STRING *user_arg, LEX_STRING *host_arg)
 static bool read_frm_file(THD *thd,
                           TABLE_SHARE *share,
                           FRM_context *frm_context,
-                          const std::string &db,
                           const std::string &table,
                           bool is_fix_view_cols_and_deps)
 {
@@ -7875,7 +7873,7 @@ bool create_table_share_for_upgrade(THD *thd,
   mysql_mutex_init(key_TABLE_SHARE_LOCK_ha_data,
                      &share->LOCK_ha_data, MY_MUTEX_INIT_FAST);
 
-  if (read_frm_file(thd, share, frm_context, db_name,
+  if (read_frm_file(thd, share, frm_context,
                     table_name, is_fix_view_cols_and_deps))
   {
     free_table_share(share);

sql/table.cc

@@ -71,8 +71,8 @@ class Deprecated_trigger_syntax_handler : public Internal_error_handler
 
   virtual bool handle_condition(THD *thd,
                                 uint sql_errno,
-                                const char *sqlstate,
-                                Sql_condition::enum_severity_level *level,
+                                const char*,
+                                Sql_condition::enum_severity_level*,
                                 const char *message)
   {
     if (sql_errno != EE_OUTOFMEMORY &&
@@ -152,7 +152,6 @@ static bool construct_definer_value(MEM_ROOT *mem_root, LEX_CSTRING *definer,
       execution order on master and slave will be the same.
 
   @param thd                thread context
-  @param mem_root           mem-root where needed strings will be allocated
   @param[out] binlog_query  well-formed CREATE TRIGGER statement for putting
                             into binlog (after successful execution)
   @param def_user           user part of a definer value
@@ -165,7 +164,6 @@ static bool construct_definer_value(MEM_ROOT *mem_root, LEX_CSTRING *definer,
 
 static bool construct_create_trigger_stmt_with_definer(
   THD *thd,
-  MEM_ROOT *mem_root,
   String *binlog_query,
   const LEX_CSTRING &def_user,
   const LEX_CSTRING &def_host)
@@ -296,7 +294,6 @@ Trigger *Trigger::create_from_parser(THD *thd,
   definer_host= lex->definer->host;
 
   if (construct_create_trigger_stmt_with_definer(thd,
-                                                 &subject_table->mem_root,
                                                  binlog_create_trigger_stmt,
                                                  definer_user,
                                                  definer_host))

sql/trigger.cc

@@ -1199,7 +1199,9 @@ class Time_zone_utc : public Time_zone
     0
 */
 my_time_t
-Time_zone_utc::TIME_to_gmt_sec(const MYSQL_TIME *t, bool *in_dst_time_gap) const
+Time_zone_utc::TIME_to_gmt_sec(
+  const MYSQL_TIME *t MY_ATTRIBUTE((unused)),
+  bool *in_dst_time_gap MY_ATTRIBUTE((unused))) const
 {
   /* Should be never called */
   DBUG_ASSERT(0);
@@ -1412,7 +1414,9 @@ Time_zone_offset::Time_zone_offset(long tz_offset_arg):
     Corresponding my_time_t value or 0 in case of error
 */
 my_time_t
-Time_zone_offset::TIME_to_gmt_sec(const MYSQL_TIME *t, bool *in_dst_time_gap) const
+Time_zone_offset::TIME_to_gmt_sec(
+  const MYSQL_TIME *t,
+  bool *in_dst_time_gap MY_ATTRIBUTE((unused))) const
 {
   my_time_t local_t;
   int shift= 0;

sql/tztime.cc

@@ -361,7 +361,7 @@ merge_buffers(THD *thd, Uniq_param *param, IO_CACHE *from_file,
 
 
 
-int unique_write_to_file(uchar* key, element_count count, Unique *unique)
+int unique_write_to_file(uchar* key, element_count, Unique *unique)
 {
   /*
     Use unique->size (size of element stored in the tree) and not
@@ -372,7 +372,7 @@ int unique_write_to_file(uchar* key, element_count count, Unique *unique)
   return my_b_write(&unique->file, key, unique->size) ? 1 : 0;
 }
 
-int unique_write_to_ptrs(uchar* key, element_count count, Unique *unique)
+int unique_write_to_ptrs(uchar* key, element_count, Unique *unique)
 {
   memcpy(unique->record_pointers, key, unique->size);
   unique->record_pointers+=unique->size;

sql/uniques.cc

@@ -104,8 +104,7 @@ void xid_t::set(my_xid xid)
 }
 
 
-static bool xacommit_handlerton(THD *unused1, plugin_ref plugin,
-                                void *arg)
+static bool xacommit_handlerton(THD*, plugin_ref plugin, void *arg)
 {
   handlerton *hton= plugin_data<handlerton*>(plugin);
   if (hton->state == SHOW_OPTION_YES && hton->recover)
@@ -115,8 +114,7 @@ static bool xacommit_handlerton(THD *unused1, plugin_ref plugin,
 }
 
 
-static bool xarollback_handlerton(THD *unused1, plugin_ref plugin,
-                                  void *arg)
+static bool xarollback_handlerton(THD*, plugin_ref plugin, void *arg)
 {
   handlerton *hton= plugin_data<handlerton*>(plugin);
   if (hton->state == SHOW_OPTION_YES && hton->recover)
@@ -126,7 +124,7 @@ static bool xarollback_handlerton(THD *unused1, plugin_ref plugin,
 }
 
 
-static void ha_commit_or_rollback_by_xid(THD *thd, XID *xid, bool commit)
+static void ha_commit_or_rollback_by_xid(THD*, XID *xid, bool commit)
 {
   plugin_foreach(NULL, commit ? xacommit_handlerton : xarollback_handlerton,
                  MYSQL_STORAGE_ENGINE_PLUGIN, xid);
@@ -142,8 +140,7 @@ struct xarecover_st
 };
 
 
-static bool xarecover_handlerton(THD *unused, plugin_ref plugin,
-                                 void *arg)
+static bool xarecover_handlerton(THD*, plugin_ref plugin, void *arg)
 {
   handlerton *hton= plugin_data<handlerton*>(plugin);
   struct xarecover_st *info= (struct xarecover_st *) arg;
@@ -1319,12 +1316,11 @@ bool applier_reset_xa_trans(THD *thd)
 
   @param[in,out]     thd     Thread context
   @param             plugin  Reference to handlerton
-  @param             unused  Unused
 
   @return    FALSE   on success, TRUE otherwise.
 */
 
-bool detach_native_trx(THD *thd, plugin_ref plugin, void *unused)
+bool detach_native_trx(THD *thd, plugin_ref plugin, void*)
 {
   handlerton *hton= plugin_data<handlerton *>(plugin);
 

sql/xa.cc

@@ -647,13 +647,11 @@ struct st_plugin_int *plugin_find_by_type(const LEX_CSTRING &plugin, int type);
 
   @param[in,out]     thd     Thread context
   @param             plugin  Reference to handlerton
-  @param             unused  Unused
 
   @return    FALSE   on success, TRUE otherwise.
 */
 
-bool detach_native_trx(THD *thd, plugin_ref plugin,
-                       void *unused);
+bool detach_native_trx(THD *thd, plugin_ref plugin, void *);
 
 /**
   Reset some transaction state information and delete corresponding

sql/xa.h

@@ -4371,7 +4371,7 @@ apply_tertiary_shift_900(MY_CHARSET_LOADER *loader, MY_COLL_RULES *rules,
 
 static bool
 apply_shift_900(MY_CHARSET_LOADER *loader,
-                MY_COLL_RULES *rules, MY_COLL_RULE *r, int level,
+                MY_COLL_RULES *rules, MY_COLL_RULE *r,
                 uint16 *to, size_t to_stride, size_t nweights)
 {
   // nweights should not less than 1 because of the extra CE.
@@ -4397,7 +4397,7 @@ apply_shift(MY_CHARSET_LOADER *loader,
             uint16 *to, size_t to_stride, size_t nweights)
 {
   if (rules->uca->version == UCA_V900)
-    return apply_shift_900(loader, rules, r, level, to, to_stride, nweights);
+    return apply_shift_900(loader, rules, r, to, to_stride, nweights);
 
   DBUG_ASSERT(to_stride == 1);
 
@@ -5081,8 +5081,7 @@ static int my_prepare_reorder(CHARSET_INFO *cs)
   return rec_ind;
 }
 
-static void adjust_japanese_weight(CHARSET_INFO *cs, MY_COLL_RULES *rules,
-                                   int rec_ind)
+static void adjust_japanese_weight(CHARSET_INFO *cs, int rec_ind)
 {
   /*
     Per CLDR 30, Japanese collations need to reorder characters as
@@ -5140,7 +5139,7 @@ static bool my_prepare_coll_param(CHARSET_INFO *cs, MY_COLL_RULES *rules)
     return true;
 
   if (cs->coll_param == &ja_coll_param)
-    adjust_japanese_weight(cs, rules, rec_ind);
+    adjust_japanese_weight(cs, rec_ind);
   /* Might add other parametric tailoring rules later. */
   return false;
 }