Merge 10.8 into 10.9

1 files changed, 7 insertions, 14 deletions

diff --git a/sql/sql_partition_admin.h b/sql/sql_partition_admin.h
index 4be9e56e359..b50c3555bcb 100644
--- a/sql/sql_partition_admin.h
+++ b/sql/sql_partition_admin.h
@@ -127,8 +127,7 @@ public:
     : Sql_cmd_common_alter_table()
   {}
 
-  ~Sql_cmd_alter_table_exchange_partition()
-  {}
+  ~Sql_cmd_alter_table_exchange_partition() = default;
 
   bool execute(THD *thd);
 
@@ -150,8 +149,7 @@ public:
     : Sql_cmd_analyze_table()
   {}
 
-  ~Sql_cmd_alter_table_analyze_partition()
-  {}
+  ~Sql_cmd_alter_table_analyze_partition() = default;
 
   bool execute(THD *thd);
 
@@ -176,8 +174,7 @@ public:
     : Sql_cmd_check_table()
   {}
 
-  ~Sql_cmd_alter_table_check_partition()
-  {}
+  ~Sql_cmd_alter_table_check_partition() = default;
 
   bool execute(THD *thd);
 
@@ -202,8 +199,7 @@ public:
     : Sql_cmd_optimize_table()
   {}
 
-  ~Sql_cmd_alter_table_optimize_partition()
-  {}
+  ~Sql_cmd_alter_table_optimize_partition() = default;
 
   bool execute(THD *thd);
 
@@ -228,8 +224,7 @@ public:
     : Sql_cmd_repair_table()
   {}
 
-  ~Sql_cmd_alter_table_repair_partition()
-  {}
+  ~Sql_cmd_alter_table_repair_partition() = default;
 
   bool execute(THD *thd);
 
@@ -250,11 +245,9 @@ public:
   /**
     Constructor, used to represent a ALTER TABLE TRUNCATE PARTITION statement.
   */
-  Sql_cmd_alter_table_truncate_partition()
-  {}
+  Sql_cmd_alter_table_truncate_partition() = default;
 
-  virtual ~Sql_cmd_alter_table_truncate_partition()
-  {}
+  virtual ~Sql_cmd_alter_table_truncate_partition() = default;
 
   bool execute(THD *thd);