Bug#24296291: FIX -WUNUSED-PARAMETER WARNINGS

Patch #14: Fix -Wunused-parameter warnings in new DD.

Author: jhauglid

sql-common/client_authentication.cc

@@ -45,7 +45,7 @@
 mysql_mutex_t g_public_key_mutex;
 #endif
 
-int sha256_password_init(char *a, size_t b, int c, va_list d)
+int sha256_password_init(char *, size_t, int, va_list)
 {
 #if !defined(HAVE_YASSL)
   mysql_mutex_init(0,&g_public_key_mutex, MY_MUTEX_INIT_SLOW);

sql/dd/dd_table.cc

@@ -263,7 +263,6 @@ dd::String_type get_sql_type_by_create_field(TABLE *table,
   used by the I_S queries only.
   For others, default value can be obtained from the columns.default_values.
 
-  @param[in]      thd        Thread handle.
   @param[in]      buf        Default value buffer.
   @param[in]      table      Table object.
   @param[in]      field      Field information.
@@ -276,8 +275,7 @@ dd::String_type get_sql_type_by_create_field(TABLE *table,
                              column is nullptr.
 */
 
-static void prepare_default_value_string(THD *thd,
-                                         uchar *buf,
+static void prepare_default_value_string(uchar *buf,
                                          TABLE *table,
                                          const Create_field &field,
                                          dd::Column *col_obj,
@@ -758,7 +756,7 @@ fill_dd_columns_from_create_fields(THD *thd,
       prepared in prepare_default_value() is used.
     */
     String def_val;
-    prepare_default_value_string(thd, buf, &table, *field, col_obj, &def_val);
+    prepare_default_value_string(buf, &table, *field, col_obj, &def_val);
     if (def_val.ptr() != nullptr)
       col_obj->set_default_value_utf8(dd::String_type(def_val.ptr(),
                                                   def_val.length()));

sql/dd/dd_trigger.cc

@@ -117,7 +117,6 @@ get_dd_action_timing(const ::Trigger *new_trigger)
 /**
   Fill in a dd::Trigger object based on a Trigger object supplied by sql-layer.
 
-  @param [in]   thd               thread handle
   @param [in]   new_trigger       Trigger object supplied by sql-layer
   @param [out]  dd_trig_obj       dd::Trigger object to fill in
 
@@ -126,7 +125,7 @@ get_dd_action_timing(const ::Trigger *new_trigger)
     @retval false  Success
 */
 
-static bool fill_in_dd_trigger_object(THD *thd, const ::Trigger *new_trigger,
+static bool fill_in_dd_trigger_object(const ::Trigger *new_trigger,
                                       Trigger *dd_trig_obj)
 {
   dd_trig_obj->set_name(String_type(new_trigger->get_trigger_name().str,
@@ -258,7 +257,7 @@ bool create_trigger(THD *thd, const ::Trigger *new_trigger,
     // by the dd::cache::Dictionary_client::add_trigger.
     DBUG_RETURN(true);
 
-  if (fill_in_dd_trigger_object(thd, new_trigger, dd_trig_obj))
+  if (fill_in_dd_trigger_object(new_trigger, dd_trig_obj))
     DBUG_RETURN(true);
 
   /*

sql/dd/dd_upgrade.cc

@@ -3495,7 +3495,7 @@ bool find_files_with_metadata(THD *thd, const char *dbname,
   Scans datadir for databases and lists all the database names.
 */
 
-bool find_schema_from_datadir(THD *thd, std::vector<String_type> *db_name)
+bool find_schema_from_datadir(std::vector<String_type> *db_name)
 {
   MY_DIR *a;
   uint i;

sql/dd/dd_upgrade.h

@@ -65,13 +65,12 @@ bool find_files_with_metadata(THD *thd, const char *dbname,
   Find all the directories inside data directory. Every directory will be
   treated as a schema. These directories are in filename-encoded form.
 
-  @param[in]  thd        Thread handle.
   @param[out] db_name    An std::vector containing all database name.
 
   @retval false  ON SUCCESS
   @retval true   ON FAILURE
 */
-bool find_schema_from_datadir(THD *thd, std::vector<String_type> *db_name);
+bool find_schema_from_datadir(std::vector<String_type> *db_name);
 
 /**
   Create entry in mysql.schemata for all the folders found in data directory.

sql/dd/impl/bootstrapper.cc

@@ -261,7 +261,7 @@ bool store_single_schema_table_meta_data(THD *thd,
     false on success
     true when fails to store the metadata.
 */
-bool store_schema_table_meta_data(THD *thd, plugin_ref plugin, void *unused)
+bool store_schema_table_meta_data(THD *thd, plugin_ref plugin, void*)
 {
   // Fetch schema ID of IS schema.
   const dd::Schema *IS_schema_obj= nullptr;
@@ -863,7 +863,7 @@ bool sync_meta_data(THD *thd)
 
     // Get the synced DD schema object id. Needed for the DD table name keys.
     Object_id dd_schema_id= cache::Storage_adapter::instance()->
-      core_get_id<Schema>(thd, schema_key);
+      core_get_id<Schema>(schema_key);
 
     // Sync the DD tables.
     for (System_tables::Const_iterator it= System_tables::instance()->begin();
@@ -1038,7 +1038,7 @@ bool verify_core_objects_present(THD *thd)
   Schema::name_key_type schema_key;
   Schema::update_name_key(&schema_key, MYSQL_SCHEMA_NAME.str);
   Object_id dd_schema_id= cache::Storage_adapter::instance()->
-    core_get_id<Schema>(thd, schema_key);
+    core_get_id<Schema>(schema_key);
 
   DBUG_ASSERT(dd_schema_id != INVALID_OBJECT_ID);
   if (dd_schema_id == INVALID_OBJECT_ID)
@@ -1067,7 +1067,7 @@ bool verify_core_objects_present(THD *thd)
     Table::update_name_key(&table_key, dd_schema_id,
                            (*it)->entity()->name());
     Object_id dd_table_id= cache::Storage_adapter::instance()->
-      core_get_id<Table>(thd, table_key);
+      core_get_id<Table>(table_key);
 
     DBUG_ASSERT(dd_table_id != INVALID_OBJECT_ID);
     if (dd_table_id == INVALID_OBJECT_ID)
@@ -1085,7 +1085,7 @@ bool verify_core_objects_present(THD *thd)
   Tablespace::name_key_type tspace_key;
   Tablespace::update_name_key(&tspace_key, MYSQL_TABLESPACE_NAME.str);
   Object_id dd_tspace_id= cache::Storage_adapter::instance()->
-    core_get_id<Tablespace>(thd, tspace_key);
+    core_get_id<Tablespace>(tspace_key);
 #endif
 
   /*
@@ -1493,7 +1493,7 @@ bool upgrade_fill_dd_and_finalize(THD *thd)
   std::vector<dd::String_type> db_name;
   std::vector<dd::String_type>::iterator it;
 
-  if (find_schema_from_datadir(thd, &db_name))
+  if (find_schema_from_datadir(&db_name))
   {
     delete_dictionary_and_cleanup(thd);
     return true;

sql/dd/impl/cache/dictionary_client.cc

@@ -394,7 +394,7 @@ class MDL_checker
 
 public:
   // Releasing arbitrary dictionary objects is not checked.
-  static bool is_release_locked(THD *thd, const dd::Dictionary_object *object)
+  static bool is_release_locked(THD*, const dd::Dictionary_object*)
   { return true; }
 
   // Reading a table object should be governed by MDL_SHARED.
@@ -506,7 +506,7 @@ class MDL_checker
 
 // Check if the component is hidden.
 template <typename T>
-bool is_component_hidden(dd::Raw_record *r)
+bool is_component_hidden(dd::Raw_record*)
 { return false; }
 
 template <>

sql/dd/impl/cache/storage_adapter.cc

@@ -83,8 +83,7 @@ size_t Storage_adapter::core_size()
 
 // Get a dictionary object id from core storage.
 template <typename T>
-Object_id Storage_adapter::core_get_id(THD *thd,
-                                       const typename T::name_key_type &key)
+Object_id Storage_adapter::core_get_id(const typename T::name_key_type &key)
 {
   Cache_element<typename T::cache_partition_type> *element= nullptr;
   Mutex_lock lock(&m_lock);
@@ -100,7 +99,7 @@ Object_id Storage_adapter::core_get_id(THD *thd,
 
 // Get a dictionary object from core storage.
 template <typename K, typename T>
-void Storage_adapter::core_get(THD *thd, const K &key, const T **object)
+void Storage_adapter::core_get(const K &key, const T **object)
 {
   DBUG_ASSERT(object);
   *object= nullptr;
@@ -126,7 +125,7 @@ bool Storage_adapter::get(THD *thd,
   DBUG_ASSERT(object);
   *object= nullptr;
 
-  instance()->core_get(thd, key, object);
+  instance()->core_get(key, object);
   if (*object || s_use_fake_storage)
     return false;
 
@@ -419,23 +418,20 @@ template bool Storage_adapter::core_sync(THD *,
                                          const Schema*);
 
 template Object_id Storage_adapter::core_get_id<Table>(
-      THD *,
       const Table::name_key_type &);
 template Object_id Storage_adapter::core_get_id<Schema>(
-      THD *,
       const Schema::name_key_type &);
 template Object_id Storage_adapter::core_get_id<Tablespace>(
-      THD *,
       const Tablespace::name_key_type &);
 
 template
-void Storage_adapter::core_get(THD*,
+void Storage_adapter::core_get(
        dd::Item_name_key const&, const dd::Schema**);
 template
-void Storage_adapter::core_get<dd::Item_name_key, dd::Abstract_table>(THD*,
+void Storage_adapter::core_get<dd::Item_name_key, dd::Abstract_table>(
        dd::Item_name_key const&, const dd::Abstract_table**);
 template
-void Storage_adapter::core_get<dd::Global_name_key, dd::Tablespace>(THD*,
+void Storage_adapter::core_get<dd::Global_name_key, dd::Tablespace>(
        dd::Global_name_key const&, const dd::Tablespace**);
 
 template Object_id Storage_adapter::next_oid<Abstract_table>();
@@ -572,12 +568,12 @@ template bool Storage_adapter::store(THD *, Tablespace*);
 */
 
 template <>
-void Storage_adapter::core_get(THD*, const Table_stat::name_key_type&,
+void Storage_adapter::core_get(const Table_stat::name_key_type&,
                                const Table_stat**)
 { }
 
 template <>
-void Storage_adapter::core_get(THD*, const Index_stat::name_key_type&,
+void Storage_adapter::core_get(const Index_stat::name_key_type&,
                                const Index_stat**)
 { }
 

sql/dd/impl/cache/storage_adapter.h

@@ -96,13 +96,12 @@ friend class dd_cache_unittest::CacheStorageTest;
 
     @tparam      K         Key type.
     @tparam      T         Dictionary object type.
-    @param       thd       Thread context.
     @param       key       Key for which to get the object.
     @param [out] object    Object retrieved, possibly nullptr if not present.
   */
 
   template <typename K, typename T>
-  void core_get(THD *thd, const K &key, const T **object);
+  void core_get(const K &key, const T **object);
 
 
   Object_registry m_core_registry;   // Object registry storing core DD objects.
@@ -142,13 +141,12 @@ friend class dd_cache_unittest::CacheStorageTest;
     Get a dictionary object id from core storage.
 
     @tparam      T         Dictionary object type.
-    @param       thd       Thread context.
     @param       key       Name key for which to get the object id.
     @return      Object id, INVALID_OBJECT_ID if the object is not present.
   */
 
   template <typename T>
-  Object_id core_get_id(THD *thd, const typename T::name_key_type &key);
+  Object_id core_get_id(const typename T::name_key_type &key);
 
 
   /**

sql/dd/impl/sdi.h

@@ -153,7 +153,8 @@ namespace sdi {
  */
 
 template <class DDT>
-inline bool store(THD *thd, const DDT *ddo)
+inline bool store(THD *thd MY_ATTRIBUTE((unused)),
+                  const DDT *ddo MY_ATTRIBUTE((unused)))
 {
   return false;
 }
@@ -225,7 +226,8 @@ bool store(THD *thd, const Tablespace *ts);
  */
 
 template <class DDT>
-inline bool drop(THD *thd, const DDT*)
+inline bool drop(THD *thd MY_ATTRIBUTE((unused)),
+                 const DDT*)
 {
   return false;
 }
@@ -297,7 +299,9 @@ bool drop(THD *thd, const Tablespace *ts);
  */
 
 template <class DDT>
-inline bool drop_after_update(THD *thd, const DDT *old_ddo, const DDT *new_ddo)
+inline bool drop_after_update(THD *thd MY_ATTRIBUTE((unused)),
+                              const DDT *old_ddo MY_ATTRIBUTE((unused)),
+                              const DDT *new_ddo MY_ATTRIBUTE((unused)))
 {
   return false;
 }