Merge 10.4 into 10.5

9 files changed, 17 insertions, 21 deletions

diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index 937b1177ae4..db24e33a141 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -189,9 +189,7 @@ database::database(const config& c)
 {
 }
 
-database::~database()
-{
-}
+database::~database() = default;
 
 dbcontext_ptr
 database::create_context(bool for_write) volatile
@@ -226,9 +224,7 @@ dbcontext::dbcontext(volatile database *d, bool for_write)
   user_level_lock_timeout = d->get_conf().get_int("wrlock_timeout", 12);
 }
 
-dbcontext::~dbcontext()
-{
-}
+dbcontext::~dbcontext() = default;
 
 namespace {
 
diff --git a/plugin/handler_socket/handlersocket/database.hpp b/plugin/handler_socket/handlersocket/database.hpp
index a4aee0874c7..ed5d00800d9 100644
--- a/plugin/handler_socket/handlersocket/database.hpp
+++ b/plugin/handler_socket/handlersocket/database.hpp
@@ -27,7 +27,7 @@ struct dbcontext_i;
 typedef std::auto_ptr<dbcontext_i> dbcontext_ptr;
 
 struct database_i {
-  virtual ~database_i() { }
+  virtual ~database_i() = default;
   virtual dbcontext_ptr create_context(bool for_write) volatile = 0;
   virtual void stop() volatile = 0;
   virtual const config& get_conf() const volatile = 0;
@@ -57,7 +57,7 @@ struct prep_stmt {
 };
 
 struct dbcallback_i {
-  virtual ~dbcallback_i () { }
+  virtual ~dbcallback_i() = default;
   virtual void dbcb_set_prep_stmt(size_t pst_id, const prep_stmt& v) = 0;
   virtual const prep_stmt *dbcb_get_prep_stmt(size_t pst_id) const = 0;
   virtual void dbcb_resp_short(uint32_t code, const char *msg) = 0;
@@ -111,7 +111,7 @@ struct cmd_exec_args {
 };
 
 struct dbcontext_i {
-  virtual ~dbcontext_i() { }
+  virtual ~dbcontext_i() = default;
   virtual void init_thread(const void *stack_bottom,
     volatile int& shutdown_flag) = 0;
   virtual void term_thread() = 0;
diff --git a/plugin/handler_socket/handlersocket/hstcpsvr.hpp b/plugin/handler_socket/handlersocket/hstcpsvr.hpp
index 811bfa25613..5fbed92402b 100644
--- a/plugin/handler_socket/handlersocket/hstcpsvr.hpp
+++ b/plugin/handler_socket/handlersocket/hstcpsvr.hpp
@@ -47,7 +47,7 @@ struct hstcpsvr_i;
 typedef std::auto_ptr<hstcpsvr_i> hstcpsvr_ptr;
 
 struct hstcpsvr_i {
-  virtual ~hstcpsvr_i() { }
+  virtual ~hstcpsvr_i() = default;
   virtual std::string start_listen() = 0;
   static hstcpsvr_ptr create(const config& conf);
 };
diff --git a/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp b/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp
index 497581c27a7..25612adec0f 100644
--- a/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp
+++ b/plugin/handler_socket/handlersocket/hstcpsvr_worker.hpp
@@ -24,7 +24,7 @@ struct hstcpsvr_worker_arg {
 };
 
 struct hstcpsvr_worker_i {
-  virtual ~hstcpsvr_worker_i() { }
+  virtual ~hstcpsvr_worker_i() = default;
   virtual void run() = 0;
   static hstcpsvr_worker_ptr create(const hstcpsvr_worker_arg& arg);
 };
diff --git a/plugin/handler_socket/libhsclient/hstcpcli.hpp b/plugin/handler_socket/libhsclient/hstcpcli.hpp
index 11dec8ebb0b..fa0d4db1742 100644
--- a/plugin/handler_socket/libhsclient/hstcpcli.hpp
+++ b/plugin/handler_socket/libhsclient/hstcpcli.hpp
@@ -33,7 +33,7 @@ struct hstcpcli_i;
 typedef std::auto_ptr<hstcpcli_i> hstcpcli_ptr;
 
 struct hstcpcli_i {
-  virtual ~hstcpcli_i() { }
+  virtual ~hstcpcli_i() = default;
   virtual void close() = 0;
   virtual int reconnect() = 0;
   virtual bool stable_point() = 0;
diff --git a/plugin/handler_socket/libhsclient/util.hpp b/plugin/handler_socket/libhsclient/util.hpp
index 93d78cc7dc0..60b5441703d 100644
--- a/plugin/handler_socket/libhsclient/util.hpp
+++ b/plugin/handler_socket/libhsclient/util.hpp
@@ -13,7 +13,7 @@ namespace dena {
 
 /* boost::noncopyable */
 struct noncopyable {
-  noncopyable() { }
+  noncopyable() = default;
  private:
   noncopyable(const noncopyable&);
   noncopyable& operator =(const noncopyable&);
diff --git a/plugin/query_response_time/query_response_time.cc b/plugin/query_response_time/query_response_time.cc
index a669f7d4236..e344f45b392 100644
--- a/plugin/query_response_time/query_response_time.cc
+++ b/plugin/query_response_time/query_response_time.cc
@@ -153,7 +153,7 @@ class time_collector
 
 public:
   time_collector(utility& u): m_utility(&u) { flush(); }
-  ~time_collector() { }
+  ~time_collector() = default;
   uint32_t count(uint index) { return m_count[index]; }
   uint64_t total(uint index) { return m_total[index]; }
   void flush()
diff --git a/plugin/type_inet/sql_type_inet.h b/plugin/type_inet/sql_type_inet.h
index c1abb11fc59..64d26953cff 100644
--- a/plugin/type_inet/sql_type_inet.h
+++ b/plugin/type_inet/sql_type_inet.h
@@ -67,8 +67,8 @@ protected:
     memcpy(m_buffer, str, length);
     return false;
   }
-  // Non-initializing constructor
-  Inet4() { }
+
+  Inet4() = default;
 public:
   void to_binary(char *dst, size_t dstsize) const
   {
@@ -161,7 +161,7 @@ protected:
     return false;
   }
 
-  Inet6() { }
+  Inet6() = default;
 
 public:
   static uint binary_length() { return IN6_ADDR_SIZE; }
diff --git a/plugin/versioning/versioning.cc b/plugin/versioning/versioning.cc
index 6d8f77550f6..c970a9d6561 100644
--- a/plugin/versioning/versioning.cc
+++ b/plugin/versioning/versioning.cc
@@ -36,8 +36,8 @@ public:
   static Create_func_trt<TRT_FIELD> s_singleton;
 
 protected:
-  Create_func_trt<TRT_FIELD>() {}
-  virtual ~Create_func_trt<TRT_FIELD>() {}
+  Create_func_trt<TRT_FIELD>() = default;
+  virtual ~Create_func_trt<TRT_FIELD>() = default;
 };
 
 template<TR_table::field_id_t TRT_FIELD>
@@ -132,8 +132,8 @@ public:
   static Create_func_trt_trx_sees<Item_func_trt_trx_seesX> s_singleton;
 
 protected:
-  Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() {}
-  virtual ~Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() {}
+  Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default;
+  virtual ~Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default;
 };
 
 template<class X>