Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

Patch #10: Fix -Wunused-parameter warnings in sp*

Author: jhauglid

sql/lock.cc

@@ -291,7 +291,7 @@ static void track_table_access(THD *thd, TABLE **tables, size_t count)
 
     if (t)
     {
-      s= tst->calc_trx_state(thd, t->reginfo.lock_type,
+      s= tst->calc_trx_state(t->reginfo.lock_type,
                              t->file->has_transactions());
       tst->add_trx_state(thd, s);
     }

sql/mysqld.cc

@@ -6835,7 +6835,7 @@ static int show_slave_last_heartbeat(THD *thd, SHOW_VAR *var, char *buff)
 /**
   Only for default channel. For details, refer to show_slave_running()
 */
-static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff)
+static int show_heartbeat_period(THD*, SHOW_VAR *var, char *buff)
 {
   channel_map.rdlock();
   Master_info *mi= channel_map.get_default_channel_mi();

sql/parser_service.cc

@@ -122,7 +122,7 @@ class Plugin_error_handler: public Internal_error_handler
       thd->push_internal_handler(this);
   }
 
-  virtual bool handle_condition(THD *thd,
+  virtual bool handle_condition(THD*,
                                 uint sql_errno_u,
                                 const char* sqlstate,
                                 Sql_condition::enum_severity_level *,

sql/partitioning/partition_handler.cc

@@ -1098,7 +1098,7 @@ uint32 Partition_helper::ph_calculate_key_hash_value(Field **field_array)
 }
 
 
-bool Partition_helper::print_partition_error(int error, myf errflag)
+bool Partition_helper::print_partition_error(int error)
 {
   THD *thd= get_thd();
   DBUG_ENTER("Partition_helper::print_partition_error");
@@ -1248,8 +1248,6 @@ void Partition_helper::prepare_change_partitions()
   @param[in]  create_info       HA_CREATE_INFO object describing all
                                 fields and indexes in table
   @param[in]  path              Complete path of db and table name
-  @param[out] copied            Output parameter where number of copied
-                                records are added
   @param[out] deleted           Output parameter where number of deleted
                                 records are added
 
@@ -1260,7 +1258,6 @@ void Partition_helper::prepare_change_partitions()
 
 int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
                                         const char *path,
-                                        ulonglong * const copied,
                                         ulonglong * const deleted)
 {
   List_iterator<partition_element> part_it(m_part_info->partitions);
@@ -1478,7 +1475,7 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
     DBUG_ASSERT(part_elem->part_state == PART_TO_BE_REORGED);
     part_elem->part_state= PART_TO_BE_DROPPED;
   }
-  error= copy_partitions(copied, deleted);
+  error= copy_partitions(deleted);
 err:
   if (error)
   {
@@ -1500,16 +1497,14 @@ int Partition_helper::change_partitions(HA_CREATE_INFO *create_info,
   actually copy the data from the reorganized partitions to the new
   partitions.
 
-  @param[out] copied   Number of records copied.
   @param[out] deleted  Number of records deleted.
 
   @return Operation status
     @retval  0  Success
     @retval >0  Error code
 */
 
-int Partition_helper::copy_partitions(ulonglong * const copied,
-                                      ulonglong * const deleted)
+int Partition_helper::copy_partitions(ulonglong * const deleted)
 {
   uint new_part= 0;
   int result= 0;
@@ -2827,15 +2822,14 @@ int Partition_helper::ph_index_next(uchar *buf)
   as supplied in the call.
 
   @param[out] buf     Read row in MySQL Row Format.
-  @param[in]  key     Key.
   @param[in]  keylen  Length of key.
 
   @return Operation status.
     @retval    0  Success
     @retval != 0  Error code
 */
 
-int Partition_helper::ph_index_next_same(uchar *buf, const uchar *key, uint keylen)
+int Partition_helper::ph_index_next_same(uchar *buf, uint keylen)
 {
   DBUG_ENTER("Partition_helper::ph_index_next_same");
 

sql/partitioning/partition_handler.h

@@ -627,7 +627,7 @@ class Partition_helper : public Sql_alloc
   int ph_index_first(uchar *buf);
   int ph_index_last(uchar *buf);
   int ph_index_next(uchar *buf);
-  int ph_index_next_same(uchar *buf, const uchar *key, uint keylen);
+  int ph_index_next_same(uchar *buf, uint keylen);
   int ph_index_prev(uchar *buf);
   int ph_index_read_map(uchar *buf,
                         const uchar *key,
@@ -688,8 +688,6 @@ class Partition_helper : public Sql_alloc
     @param[in]  create_info       HA_CREATE_INFO object describing all
                                   fields and indexes in table
     @param[in]  path              Complete path of db and table name
-    @param[out] copied            Output parameter where number of copied
-                                  records are added
     @param[out] deleted           Output parameter where number of deleted
                                   records are added
 
@@ -699,7 +697,6 @@ class Partition_helper : public Sql_alloc
   */
   virtual int change_partitions(HA_CREATE_INFO *create_info,
                                 const char *path,
-                                ulonglong * const copied,
                                 ulonglong * const deleted);
   /** @} */
 
@@ -779,10 +776,9 @@ class Partition_helper : public Sql_alloc
 
   /** Print partitioning specific error.
     @param error   Error code.
-    @param errflag Error flag.
     @return false if error is printed else true.
   */
-  bool print_partition_error(int error, myf errflag);
+  bool print_partition_error(int error);
   /**
     Print a message row formatted for ANALYZE/CHECK/OPTIMIZE/REPAIR TABLE.
 
@@ -832,15 +828,13 @@ class Partition_helper : public Sql_alloc
     actually copy the data from the reorganized partitions to the new
     partitions.
 
-    @param[out] copied   Number of records copied.
     @param[out] deleted  Number of records deleted.
 
     @return Operation status
       @retval  0  Success
       @retval >0  Error code
   */
-  virtual int copy_partitions(ulonglong * const copied,
-                              ulonglong * const deleted);
+  virtual int copy_partitions(ulonglong * const deleted);
 
 private:
   enum partition_index_scan_type

sql/protocol_classic.cc

@@ -1833,7 +1833,7 @@ SSL_handle Protocol_classic::get_ssl()
 }
 
 
-int Protocol_classic::shutdown(bool server_shutdown)
+int Protocol_classic::shutdown(bool)
 {
   return m_thd->net.vio ? vio_shutdown(m_thd->net.vio) : 0;
 }
@@ -2096,14 +2096,12 @@ bool Protocol_binary::send_parameters(List<Item_param> *parameters,
   Sets OUT-parameters to user variables.
 
   @param parameters  List of PS/SP parameters (both input and output).
-  @param is_sql_prepare  not used.
 
   @return Error status.
     @retval false Success.
     @retval true  Error.
 */
-bool Protocol_text::send_parameters(List<Item_param> *parameters,
-                                    bool is_sql_prepare)
+bool Protocol_text::send_parameters(List<Item_param> *parameters, bool)
 {
   List_iterator_fast<Item_param> item_param_it(*parameters);
   List_iterator_fast<LEX_STRING> user_var_name_it(

sql/protocol_classic.h

@@ -232,8 +232,7 @@ class Protocol_text : public Protocol_classic
   virtual bool store_time(MYSQL_TIME *time, uint precision);
   virtual bool store(Proto_field *field);
   virtual void start_row();
-  virtual bool send_parameters(List<Item_param> *parameters,
-                               bool is_sql_prepare);
+  virtual bool send_parameters(List<Item_param> *parameters, bool);
 
   virtual enum enum_protocol_type type() { return PROTOCOL_TEXT; };
 protected:

sql/sdi_utils.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 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
@@ -22,9 +22,10 @@
 
 
 /* purecov: begin deadcode */
-bool create_serialized_meta_data(const char *schema_name,
-                                 const char *table_name,
-                                 uchar **meta_data, size_t *meta_data_length)
+bool create_serialized_meta_data(const char *schema_name MY_ATTRIBUTE((unused)),
+                                 const char *table_name MY_ATTRIBUTE((unused)),
+                                 uchar **meta_data MY_ATTRIBUTE((unused)),
+                                 size_t *meta_data_length MY_ATTRIBUTE((unused)))
 {
   /*
     TODO: This function is currently not implemented. The procedure here
@@ -53,9 +54,9 @@ bool create_serialized_meta_data(const char *schema_name,
 }
 
 
-bool import_serialized_meta_data(const uchar *meta_data,
-                                 size_t meta_data_length,
-                                 bool readonly)
+bool import_serialized_meta_data(const uchar *meta_data MY_ATTRIBUTE((unused)),
+                                 size_t meta_data_length MY_ATTRIBUTE((unused)),
+                                 bool readonly MY_ATTRIBUTE((unused)))
 {
   // TODO: This function is currently not implemented. Return error so
   // that client code will not attempt to open a non-existent table

sql/session_tracker.cc

@@ -235,7 +235,7 @@ class Current_schema_tracker : public State_tracker
 
   bool enable(THD *thd)
   { return update(thd); }
-  bool check(THD *thd, set_var *var)
+  bool check(THD*, set_var*)
   { return false; }
   bool update(THD *thd);
   bool store(THD *thd, String &buf);
@@ -387,7 +387,7 @@ class Session_gtids_tracker : public State_tracker, Session_consistency_gtids_ct
 
   bool enable(THD *thd)
   { return update(thd); }
-  bool check(THD *thd, set_var *var)
+  bool check(THD*, set_var*)
   { return false; }
   bool update(THD *thd);
   bool store(THD *thd, String &buf);
@@ -1243,9 +1243,7 @@ bool Transaction_state_tracker::store(THD *thd, String &buf)
   Mark the tracker as changed.
 */
 
-void Transaction_state_tracker::mark_as_changed(THD *thd,
-                                                LEX_CSTRING *tracked_item_name
-                                                MY_ATTRIBUTE((unused)))
+void Transaction_state_tracker::mark_as_changed(THD*, LEX_CSTRING*)
 {
   m_changed                    = true;
 }
@@ -1269,14 +1267,12 @@ void Transaction_state_tracker::reset()
           non-transactional), and returns the corresponding access flag
           out of TX_READ_TRX, TX_READ_UNSAFE, TX_WRITE_TRX, TX_WRITE_UNSAFE.
 
-  @param thd                The thd handle
   @param l                  The table's access/lock type
   @param has_trx            Whether the table's engine is transactional
 
   @return                   The table access flag
 */
-enum_tx_state Transaction_state_tracker::calc_trx_state(THD *thd,
-                                                        thr_lock_type l,
+enum_tx_state Transaction_state_tracker::calc_trx_state(thr_lock_type l,
                                                         bool has_trx)
 {
   enum_tx_state      s;
@@ -1463,15 +1459,14 @@ bool Session_state_change_tracker::update(THD *thd)
          1byte flag value is 1 then there is a session state change else
          there is no state change information.
 
-  @param thd                The thd handle.
   @param [in,out] buf       Buffer to store the information to.
 
   @return
     false                   Success
     true                    Error
 **/
 
-bool Session_state_change_tracker::store(THD *thd, String &buf)
+bool Session_state_change_tracker::store(THD*, String &buf)
 {
   /* since its a boolean tracker length is always 1 */
   const ulonglong length= 1;
@@ -1488,7 +1483,7 @@ bool Session_state_change_tracker::store(THD *thd, String &buf)
   to= net_store_length(to, length);
 
   /* boolean tracker will go here */
-  *to= (is_state_changed(thd) ? '1' : '0');
+  *to= (is_state_changed() ? '1' : '0');
 
   reset();
 
@@ -1532,7 +1527,7 @@ void Session_state_change_tracker::reset()
   @retval false There is no session state change
 **/
 
-bool Session_state_change_tracker::is_state_changed(THD* thd)
+bool Session_state_change_tracker::is_state_changed()
 {
   return m_changed;
 }

sql/session_tracker.h

@@ -1,7 +1,7 @@
 #ifndef SESSION_TRACKER_INCLUDED
 #define SESSION_TRACKER_INCLUDED
 
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 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
@@ -192,9 +192,9 @@ class Session_state_change_tracker : public State_tracker
   bool check(THD*, set_var*)
   { return false; }
   bool update(THD *thd);
-  bool store(THD *thd, String &buf);
+  bool store(THD*, String &buf);
   void mark_as_changed(THD *thd, LEX_CSTRING *tracked_item_name);
-  bool is_state_changed(THD*);
+  bool is_state_changed();
 };
 
 
@@ -275,7 +275,7 @@ class Transaction_state_tracker : public State_tracker
   void end_trx(THD *thd);
 
   /** Helper function: turn table info into table access flag */
-  enum_tx_state calc_trx_state(THD *thd, thr_lock_type l, bool has_trx);
+  enum_tx_state calc_trx_state(thr_lock_type l, bool has_trx);
 
 private:
   enum enum_tx_changed {