1 files changed, 344 insertions, 344 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 5363a3407ab..e7381fdd8ab 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -89,9 +89,9 @@ public:
 
 protected:
   /** Constructor. */
-  Create_sp_func() {}
+  Create_sp_func() = default;
   /** Destructor. */
-  virtual ~Create_sp_func() {}
+  virtual ~Create_sp_func() = default;
 };
 
 
@@ -109,8 +109,8 @@ public:
   static Create_func_abs s_singleton;
 
 protected:
-  Create_func_abs() {}
-  virtual ~Create_func_abs() {}
+  Create_func_abs() = default;
+  virtual ~Create_func_abs() = default;
 };
 
 
@@ -122,8 +122,8 @@ public:
   static Create_func_acos s_singleton;
 
 protected:
-  Create_func_acos() {}
-  virtual ~Create_func_acos() {}
+  Create_func_acos() = default;
+  virtual ~Create_func_acos() = default;
 };
 
 
@@ -135,8 +135,8 @@ public:
   static Create_func_addtime s_singleton;
 
 protected:
-  Create_func_addtime() {}
-  virtual ~Create_func_addtime() {}
+  Create_func_addtime() = default;
+  virtual ~Create_func_addtime() = default;
 };
 
 
@@ -148,8 +148,8 @@ public:
   static Create_func_aes_encrypt s_singleton;
 
 protected:
-  Create_func_aes_encrypt() {}
-  virtual ~Create_func_aes_encrypt() {}
+  Create_func_aes_encrypt() = default;
+  virtual ~Create_func_aes_encrypt() = default;
 };
 
 
@@ -161,8 +161,8 @@ public:
   static Create_func_aes_decrypt s_singleton;
 
 protected:
-  Create_func_aes_decrypt() {}
-  virtual ~Create_func_aes_decrypt() {}
+  Create_func_aes_decrypt() = default;
+  virtual ~Create_func_aes_decrypt() = default;
 };
 
 
@@ -174,8 +174,8 @@ public:
   static Create_func_asin s_singleton;
 
 protected:
-  Create_func_asin() {}
-  virtual ~Create_func_asin() {}
+  Create_func_asin() = default;
+  virtual ~Create_func_asin() = default;
 };
 
 
@@ -188,8 +188,8 @@ public:
   static Create_func_atan s_singleton;
 
 protected:
-  Create_func_atan() {}
-  virtual ~Create_func_atan() {}
+  Create_func_atan() = default;
+  virtual ~Create_func_atan() = default;
 };
 
 
@@ -201,8 +201,8 @@ public:
   static Create_func_benchmark s_singleton;
 
 protected:
-  Create_func_benchmark() {}
-  virtual ~Create_func_benchmark() {}
+  Create_func_benchmark() = default;
+  virtual ~Create_func_benchmark() = default;
 };
 
 
@@ -214,8 +214,8 @@ public:
   static Create_func_bin s_singleton;
 
 protected:
-  Create_func_bin() {}
-  virtual ~Create_func_bin() {}
+  Create_func_bin() = default;
+  virtual ~Create_func_bin() = default;
 };
 
 
@@ -227,8 +227,8 @@ public:
   static Create_func_binlog_gtid_pos s_singleton;
 
 protected:
-  Create_func_binlog_gtid_pos() {}
-  virtual ~Create_func_binlog_gtid_pos() {}
+  Create_func_binlog_gtid_pos() = default;
+  virtual ~Create_func_binlog_gtid_pos() = default;
 };
 
 
@@ -240,8 +240,8 @@ public:
   static Create_func_bit_count s_singleton;
 
 protected:
-  Create_func_bit_count() {}
-  virtual ~Create_func_bit_count() {}
+  Create_func_bit_count() = default;
+  virtual ~Create_func_bit_count() = default;
 };
 
 
@@ -253,8 +253,8 @@ public:
   static Create_func_bit_length s_singleton;
 
 protected:
-  Create_func_bit_length() {}
-  virtual ~Create_func_bit_length() {}
+  Create_func_bit_length() = default;
+  virtual ~Create_func_bit_length() = default;
 };
 
 
@@ -266,8 +266,8 @@ public:
   static Create_func_ceiling s_singleton;
 
 protected:
-  Create_func_ceiling() {}
-  virtual ~Create_func_ceiling() {}
+  Create_func_ceiling() = default;
+  virtual ~Create_func_ceiling() = default;
 };
 
 
@@ -279,8 +279,8 @@ public:
   static Create_func_chr s_singleton;
 
 protected:
-  Create_func_chr() {}
-  virtual ~Create_func_chr() {}
+  Create_func_chr() = default;
+  virtual ~Create_func_chr() = default;
 };
 
 
@@ -292,8 +292,8 @@ public:
   static Create_func_char_length s_singleton;
 
 protected:
-  Create_func_char_length() {}
-  virtual ~Create_func_char_length() {}
+  Create_func_char_length() = default;
+  virtual ~Create_func_char_length() = default;
 };
 
 
@@ -305,8 +305,8 @@ public:
   static Create_func_coercibility s_singleton;
 
 protected:
-  Create_func_coercibility() {}
-  virtual ~Create_func_coercibility() {}
+  Create_func_coercibility() = default;
+  virtual ~Create_func_coercibility() = default;
 };
 
 class Create_func_dyncol_check : public Create_func_arg1
@@ -317,8 +317,8 @@ public:
   static Create_func_dyncol_check s_singleton;
 
 protected:
-  Create_func_dyncol_check() {}
-  virtual ~Create_func_dyncol_check() {}
+  Create_func_dyncol_check() = default;
+  virtual ~Create_func_dyncol_check() = default;
 };
 
 class Create_func_dyncol_exists : public Create_func_arg2
@@ -329,8 +329,8 @@ public:
   static Create_func_dyncol_exists s_singleton;
 
 protected:
-  Create_func_dyncol_exists() {}
-  virtual ~Create_func_dyncol_exists() {}
+  Create_func_dyncol_exists() = default;
+  virtual ~Create_func_dyncol_exists() = default;
 };
 
 class Create_func_dyncol_list : public Create_func_arg1
@@ -341,8 +341,8 @@ public:
   static Create_func_dyncol_list s_singleton;
 
 protected:
-  Create_func_dyncol_list() {}
-  virtual ~Create_func_dyncol_list() {}
+  Create_func_dyncol_list() = default;
+  virtual ~Create_func_dyncol_list() = default;
 };
 
 class Create_func_dyncol_json : public Create_func_arg1
@@ -353,8 +353,8 @@ public:
   static Create_func_dyncol_json s_singleton;
 
 protected:
-  Create_func_dyncol_json() {}
-  virtual ~Create_func_dyncol_json() {}
+  Create_func_dyncol_json() = default;
+  virtual ~Create_func_dyncol_json() = default;
 };
 
 
@@ -366,8 +366,8 @@ public:
   static Create_func_compress s_singleton;
 
 protected:
-  Create_func_compress() {}
-  virtual ~Create_func_compress() {}
+  Create_func_compress() = default;
+  virtual ~Create_func_compress() = default;
 };
 
 
@@ -380,8 +380,8 @@ public:
   static Create_func_concat s_singleton;
 
 protected:
-  Create_func_concat() {}
-  virtual ~Create_func_concat() {}
+  Create_func_concat() = default;
+  virtual ~Create_func_concat() = default;
 };
 
 
@@ -394,8 +394,8 @@ public:
   static Create_func_concat_operator_oracle s_singleton;
 
 protected:
-  Create_func_concat_operator_oracle() {}
-  virtual ~Create_func_concat_operator_oracle() {}
+  Create_func_concat_operator_oracle() = default;
+  virtual ~Create_func_concat_operator_oracle() = default;
 };
 
 
@@ -407,8 +407,8 @@ public:
   static Create_func_decode_histogram s_singleton;
 
 protected:
-  Create_func_decode_histogram() {}
-  virtual ~Create_func_decode_histogram() {}
+  Create_func_decode_histogram() = default;
+  virtual ~Create_func_decode_histogram() = default;
 };
 
 
@@ -421,8 +421,8 @@ public:
   static Create_func_decode_oracle s_singleton;
 
 protected:
-  Create_func_decode_oracle() {}
-  virtual ~Create_func_decode_oracle() {}
+  Create_func_decode_oracle() = default;
+  virtual ~Create_func_decode_oracle() = default;
 };
 
 
@@ -435,8 +435,8 @@ public:
   static Create_func_concat_ws s_singleton;
 
 protected:
-  Create_func_concat_ws() {}
-  virtual ~Create_func_concat_ws() {}
+  Create_func_concat_ws() = default;
+  virtual ~Create_func_concat_ws() = default;
 };
 
 
@@ -448,8 +448,8 @@ public:
   static Create_func_connection_id s_singleton;
 
 protected:
-  Create_func_connection_id() {}
-  virtual ~Create_func_connection_id() {}
+  Create_func_connection_id() = default;
+  virtual ~Create_func_connection_id() = default;
 };
 
 
@@ -461,8 +461,8 @@ public:
   static Create_func_nvl2 s_singleton;
 
 protected:
-  Create_func_nvl2() {}
-  virtual ~Create_func_nvl2() {}
+  Create_func_nvl2() = default;
+  virtual ~Create_func_nvl2() = default;
 };
 
 
@@ -474,8 +474,8 @@ public:
   static Create_func_conv s_singleton;
 
 protected:
-  Create_func_conv() {}
-  virtual ~Create_func_conv() {}
+  Create_func_conv() = default;
+  virtual ~Create_func_conv() = default;
 };
 
 
@@ -487,8 +487,8 @@ public:
   static Create_func_convert_tz s_singleton;
 
 protected:
-  Create_func_convert_tz() {}
-  virtual ~Create_func_convert_tz() {}
+  Create_func_convert_tz() = default;
+  virtual ~Create_func_convert_tz() = default;
 };
 
 
@@ -500,8 +500,8 @@ public:
   static Create_func_cos s_singleton;
 
 protected:
-  Create_func_cos() {}
-  virtual ~Create_func_cos() {}
+  Create_func_cos() = default;
+  virtual ~Create_func_cos() = default;
 };
 
 
@@ -513,8 +513,8 @@ public:
   static Create_func_cot s_singleton;
 
 protected:
-  Create_func_cot() {}
-  virtual ~Create_func_cot() {}
+  Create_func_cot() = default;
+  virtual ~Create_func_cot() = default;
 };
 
 
@@ -526,8 +526,8 @@ public:
   static Create_func_crc32 s_singleton;
 
 protected:
-  Create_func_crc32() {}
-  virtual ~Create_func_crc32() {}
+  Create_func_crc32() = default;
+  virtual ~Create_func_crc32() = default;
 };
 
 
@@ -539,8 +539,8 @@ public:
   static Create_func_datediff s_singleton;
 
 protected:
-  Create_func_datediff() {}
-  virtual ~Create_func_datediff() {}
+  Create_func_datediff() = default;
+  virtual ~Create_func_datediff() = default;
 };
 
 
@@ -552,8 +552,8 @@ public:
   static Create_func_dayname s_singleton;
 
 protected:
-  Create_func_dayname() {}
-  virtual ~Create_func_dayname() {}
+  Create_func_dayname() = default;
+  virtual ~Create_func_dayname() = default;
 };
 
 
@@ -565,8 +565,8 @@ public:
   static Create_func_dayofmonth s_singleton;
 
 protected:
-  Create_func_dayofmonth() {}
-  virtual ~Create_func_dayofmonth() {}
+  Create_func_dayofmonth() = default;
+  virtual ~Create_func_dayofmonth() = default;
 };
 
 
@@ -578,8 +578,8 @@ public:
   static Create_func_dayofweek s_singleton;
 
 protected:
-  Create_func_dayofweek() {}
-  virtual ~Create_func_dayofweek() {}
+  Create_func_dayofweek() = default;
+  virtual ~Create_func_dayofweek() = default;
 };
 
 
@@ -591,8 +591,8 @@ public:
   static Create_func_dayofyear s_singleton;
 
 protected:
-  Create_func_dayofyear() {}
-  virtual ~Create_func_dayofyear() {}
+  Create_func_dayofyear() = default;
+  virtual ~Create_func_dayofyear() = default;
 };
 
 
@@ -604,8 +604,8 @@ public:
   static Create_func_degrees s_singleton;
 
 protected:
-  Create_func_degrees() {}
-  virtual ~Create_func_degrees() {}
+  Create_func_degrees() = default;
+  virtual ~Create_func_degrees() = default;
 };
 
 
@@ -618,8 +618,8 @@ public:
   static Create_func_des_decrypt s_singleton;
 
 protected:
-  Create_func_des_decrypt() {}
-  virtual ~Create_func_des_decrypt() {}
+  Create_func_des_decrypt() = default;
+  virtual ~Create_func_des_decrypt() = default;
 };
 
 
@@ -632,8 +632,8 @@ public:
   static Create_func_des_encrypt s_singleton;
 
 protected:
-  Create_func_des_encrypt() {}
-  virtual ~Create_func_des_encrypt() {}
+  Create_func_des_encrypt() = default;
+  virtual ~Create_func_des_encrypt() = default;
 };
 
 
@@ -646,8 +646,8 @@ public:
   static Create_func_elt s_singleton;
 
 protected:
-  Create_func_elt() {}
-  virtual ~Create_func_elt() {}
+  Create_func_elt() = default;
+  virtual ~Create_func_elt() = default;
 };
 
 
@@ -659,8 +659,8 @@ public:
   static Create_func_encode s_singleton;
 
 protected:
-  Create_func_encode() {}
-  virtual ~Create_func_encode() {}
+  Create_func_encode() = default;
+  virtual ~Create_func_encode() = default;
 };
 
 
@@ -673,8 +673,8 @@ public:
   static Create_func_encrypt s_singleton;
 
 protected:
-  Create_func_encrypt() {}
-  virtual ~Create_func_encrypt() {}
+  Create_func_encrypt() = default;
+  virtual ~Create_func_encrypt() = default;
 };
 
 
@@ -686,8 +686,8 @@ public:
   static Create_func_exp s_singleton;
 
 protected:
-  Create_func_exp() {}
-  virtual ~Create_func_exp() {}
+  Create_func_exp() = default;
+  virtual ~Create_func_exp() = default;
 };
 
 
@@ -700,8 +700,8 @@ public:
   static Create_func_export_set s_singleton;
 
 protected:
-  Create_func_export_set() {}
-  virtual ~Create_func_export_set() {}
+  Create_func_export_set() = default;
+  virtual ~Create_func_export_set() = default;
 };
 
 
@@ -714,8 +714,8 @@ public:
   static Create_func_field s_singleton;
 
 protected:
-  Create_func_field() {}
-  virtual ~Create_func_field() {}
+  Create_func_field() = default;
+  virtual ~Create_func_field() = default;
 };
 
 
@@ -727,8 +727,8 @@ public:
   static Create_func_find_in_set s_singleton;
 
 protected:
-  Create_func_find_in_set() {}
-  virtual ~Create_func_find_in_set() {}
+  Create_func_find_in_set() = default;
+  virtual ~Create_func_find_in_set() = default;
 };
 
 
@@ -740,8 +740,8 @@ public:
   static Create_func_floor s_singleton;
 
 protected:
-  Create_func_floor() {}
-  virtual ~Create_func_floor() {}
+  Create_func_floor() = default;
+  virtual ~Create_func_floor() = default;
 };
 
 
@@ -754,8 +754,8 @@ public:
   static Create_func_format s_singleton;
 
 protected:
-  Create_func_format() {}
-  virtual ~Create_func_format() {}
+  Create_func_format() = default;
+  virtual ~Create_func_format() = default;
 };
 
 
@@ -767,8 +767,8 @@ public:
   static Create_func_found_rows s_singleton;
 
 protected:
-  Create_func_found_rows() {}
-  virtual ~Create_func_found_rows() {}
+  Create_func_found_rows() = default;
+  virtual ~Create_func_found_rows() = default;
 };
 
 
@@ -780,8 +780,8 @@ public:
   static Create_func_from_base64 s_singleton;
 
 protected:
-  Create_func_from_base64() {}
-  virtual ~Create_func_from_base64() {}
+  Create_func_from_base64() = default;
+  virtual ~Create_func_from_base64() = default;
 };
 
 
@@ -793,8 +793,8 @@ public:
   static Create_func_from_days s_singleton;
 
 protected:
-  Create_func_from_days() {}
-  virtual ~Create_func_from_days() {}
+  Create_func_from_days() = default;
+  virtual ~Create_func_from_days() = default;
 };
 
 
@@ -807,8 +807,8 @@ public:
   static Create_func_from_unixtime s_singleton;
 
 protected:
-  Create_func_from_unixtime() {}
-  virtual ~Create_func_from_unixtime() {}
+  Create_func_from_unixtime() = default;
+  virtual ~Create_func_from_unixtime() = default;
 };
 
 
@@ -820,8 +820,8 @@ public:
   static Create_func_get_lock s_singleton;
 
 protected:
-  Create_func_get_lock() {}
-  virtual ~Create_func_get_lock() {}
+  Create_func_get_lock() = default;
+  virtual ~Create_func_get_lock() = default;
 };
 
 
@@ -834,8 +834,8 @@ public:
   static Create_func_greatest s_singleton;
 
 protected:
-  Create_func_greatest() {}
-  virtual ~Create_func_greatest() {}
+  Create_func_greatest() = default;
+  virtual ~Create_func_greatest() = default;
 };
 
 
@@ -847,8 +847,8 @@ public:
   static Create_func_hex s_singleton;
 
 protected:
-  Create_func_hex() {}
-  virtual ~Create_func_hex() {}
+  Create_func_hex() = default;
+  virtual ~Create_func_hex() = default;
 };
 
 
@@ -860,8 +860,8 @@ public:
   static Create_func_ifnull s_singleton;
 
 protected:
-  Create_func_ifnull() {}
-  virtual ~Create_func_ifnull() {}
+  Create_func_ifnull() = default;
+  virtual ~Create_func_ifnull() = default;
 };
 
 
@@ -873,8 +873,8 @@ public:
   static Create_func_instr s_singleton;
 
 protected:
-  Create_func_instr() {}
-  virtual ~Create_func_instr() {}
+  Create_func_instr() = default;
+  virtual ~Create_func_instr() = default;
 };
 
 
@@ -886,8 +886,8 @@ public:
   static Create_func_is_free_lock s_singleton;
 
 protected:
-  Create_func_is_free_lock() {}
-  virtual ~Create_func_is_free_lock() {}
+  Create_func_is_free_lock() = default;
+  virtual ~Create_func_is_free_lock() = default;
 };
 
 
@@ -899,8 +899,8 @@ public:
   static Create_func_is_used_lock s_singleton;
 
 protected:
-  Create_func_is_used_lock() {}
-  virtual ~Create_func_is_used_lock() {}
+  Create_func_is_used_lock() = default;
+  virtual ~Create_func_is_used_lock() = default;
 };
 
 
@@ -912,8 +912,8 @@ public:
   static Create_func_isnull s_singleton;
 
 protected:
-  Create_func_isnull() {}
-  virtual ~Create_func_isnull() {}
+  Create_func_isnull() = default;
+  virtual ~Create_func_isnull() = default;
 };
 
 
@@ -925,8 +925,8 @@ public:
   static Create_func_json_exists s_singleton;
 
 protected:
-  Create_func_json_exists() {}
-  virtual ~Create_func_json_exists() {}
+  Create_func_json_exists() = default;
+  virtual ~Create_func_json_exists() = default;
 };
 
 
@@ -938,8 +938,8 @@ public:
   static Create_func_json_valid s_singleton;
 
 protected:
-  Create_func_json_valid() {}
-  virtual ~Create_func_json_valid() {}
+  Create_func_json_valid() = default;
+  virtual ~Create_func_json_valid() = default;
 };
 
 
@@ -951,8 +951,8 @@ public:
   static Create_func_json_compact s_singleton;
 
 protected:
-  Create_func_json_compact() {}
-  virtual ~Create_func_json_compact() {}
+  Create_func_json_compact() = default;
+  virtual ~Create_func_json_compact() = default;
 };
 
 
@@ -964,8 +964,8 @@ public:
   static Create_func_json_loose s_singleton;
 
 protected:
-  Create_func_json_loose() {}
-  virtual ~Create_func_json_loose() {}
+  Create_func_json_loose() = default;
+  virtual ~Create_func_json_loose() = default;
 };
 
 
@@ -978,8 +978,8 @@ public:
   static Create_func_json_detailed s_singleton;
 
 protected:
-  Create_func_json_detailed() {}
-  virtual ~Create_func_json_detailed() {}
+  Create_func_json_detailed() = default;
+  virtual ~Create_func_json_detailed() = default;
 };
 
 
@@ -991,8 +991,8 @@ public:
   static Create_func_json_type s_singleton;
 
 protected:
-  Create_func_json_type() {}
-  virtual ~Create_func_json_type() {}
+  Create_func_json_type() = default;
+  virtual ~Create_func_json_type() = default;
 };
 
 
@@ -1004,8 +1004,8 @@ public:
   static Create_func_json_depth s_singleton;
 
 protected:
-  Create_func_json_depth() {}
-  virtual ~Create_func_json_depth() {}
+  Create_func_json_depth() = default;
+  virtual ~Create_func_json_depth() = default;
 };
 
 
@@ -1017,8 +1017,8 @@ public:
   static Create_func_json_value s_singleton;
 
 protected:
-  Create_func_json_value() {}
-  virtual ~Create_func_json_value() {}
+  Create_func_json_value() = default;
+  virtual ~Create_func_json_value() = default;
 };
 
 
@@ -1030,8 +1030,8 @@ public:
   static Create_func_json_query s_singleton;
 
 protected:
-  Create_func_json_query() {}
-  virtual ~Create_func_json_query() {}
+  Create_func_json_query() = default;
+  virtual ~Create_func_json_query() = default;
 };
 
 
@@ -1044,8 +1044,8 @@ public:
   static Create_func_json_keys s_singleton;
 
 protected:
-  Create_func_json_keys() {}
-  virtual ~Create_func_json_keys() {}
+  Create_func_json_keys() = default;
+  virtual ~Create_func_json_keys() = default;
 };
 
 
@@ -1058,8 +1058,8 @@ public:
   static Create_func_json_contains s_singleton;
 
 protected:
-  Create_func_json_contains() {}
-  virtual ~Create_func_json_contains() {}
+  Create_func_json_contains() = default;
+  virtual ~Create_func_json_contains() = default;
 };
 
 
@@ -1072,8 +1072,8 @@ public:
   static Create_func_json_contains_path s_singleton;
 
 protected:
-  Create_func_json_contains_path() {}
-  virtual ~Create_func_json_contains_path() {}
+  Create_func_json_contains_path() = default;
+  virtual ~Create_func_json_contains_path() = default;
 };
 
 
@@ -1086,8 +1086,8 @@ public:
   static Create_func_json_extract s_singleton;
 
 protected:
-  Create_func_json_extract() {}
-  virtual ~Create_func_json_extract() {}
+  Create_func_json_extract() = default;
+  virtual ~Create_func_json_extract() = default;
 };
 
 
@@ -1100,8 +1100,8 @@ public:
   static Create_func_json_search s_singleton;
 
 protected:
-  Create_func_json_search() {}
-  virtual ~Create_func_json_search() {}
+  Create_func_json_search() = default;
+  virtual ~Create_func_json_search() = default;
 };
 
 
@@ -1114,8 +1114,8 @@ public:
   static Create_func_json_array s_singleton;
 
 protected:
-  Create_func_json_array() {}
-  virtual ~Create_func_json_array() {}
+  Create_func_json_array() = default;
+  virtual ~Create_func_json_array() = default;
 };
 
 
@@ -1128,8 +1128,8 @@ public:
   static Create_func_json_array_append s_singleton;
 
 protected:
-  Create_func_json_array_append() {}
-  virtual ~Create_func_json_array_append() {}
+  Create_func_json_array_append() = default;
+  virtual ~Create_func_json_array_append() = default;
 };
 
 
@@ -1142,8 +1142,8 @@ public:
   static Create_func_json_array_insert s_singleton;
 
 protected:
-  Create_func_json_array_insert() {}
-  virtual ~Create_func_json_array_insert() {}
+  Create_func_json_array_insert() = default;
+  virtual ~Create_func_json_array_insert() = default;
 };
 
 
@@ -1156,8 +1156,8 @@ public:
   static Create_func_json_insert s_singleton;
 
 protected:
-  Create_func_json_insert() {}
-  virtual ~Create_func_json_insert() {}
+  Create_func_json_insert() = default;
+  virtual ~Create_func_json_insert() = default;
 };
 
 
@@ -1170,8 +1170,8 @@ public:
   static Create_func_json_set s_singleton;
 
 protected:
-  Create_func_json_set() {}
-  virtual ~Create_func_json_set() {}
+  Create_func_json_set() = default;
+  virtual ~Create_func_json_set() = default;
 };
 
 
@@ -1184,8 +1184,8 @@ public:
   static Create_func_json_replace s_singleton;
 
 protected:
-  Create_func_json_replace() {}
-  virtual ~Create_func_json_replace() {}
+  Create_func_json_replace() = default;
+  virtual ~Create_func_json_replace() = default;
 };
 
 
@@ -1198,8 +1198,8 @@ public:
   static Create_func_json_remove s_singleton;
 
 protected:
-  Create_func_json_remove() {}
-  virtual ~Create_func_json_remove() {}
+  Create_func_json_remove() = default;
+  virtual ~Create_func_json_remove() = default;
 };
 
 
@@ -1212,8 +1212,8 @@ public:
   static Create_func_json_object s_singleton;
 
 protected:
-  Create_func_json_object() {}
-  virtual ~Create_func_json_object() {}
+  Create_func_json_object() = default;
+  virtual ~Create_func_json_object() = default;
 };
 
 
@@ -1226,8 +1226,8 @@ public:
   static Create_func_json_length s_singleton;
 
 protected:
-  Create_func_json_length() {}
-  virtual ~Create_func_json_length() {}
+  Create_func_json_length() = default;
+  virtual ~Create_func_json_length() = default;
 };
 
 
@@ -1240,8 +1240,8 @@ public:
   static Create_func_json_merge s_singleton;
 
 protected:
-  Create_func_json_merge() {}
-  virtual ~Create_func_json_merge() {}
+  Create_func_json_merge() = default;
+  virtual ~Create_func_json_merge() = default;
 };
 
 
@@ -1254,8 +1254,8 @@ public:
   static Create_func_json_merge_patch s_singleton;
 
 protected:
-  Create_func_json_merge_patch() {}
-  virtual ~Create_func_json_merge_patch() {}
+  Create_func_json_merge_patch() = default;
+  virtual ~Create_func_json_merge_patch() = default;
 };
 
 
@@ -1267,8 +1267,8 @@ public:
   static Create_func_json_quote s_singleton;
 
 protected:
-  Create_func_json_quote() {}
-  virtual ~Create_func_json_quote() {}
+  Create_func_json_quote() = default;
+  virtual ~Create_func_json_quote() = default;
 };
 
 
@@ -1280,8 +1280,8 @@ public:
   static Create_func_json_unquote s_singleton;
 
 protected:
-  Create_func_json_unquote() {}
-  virtual ~Create_func_json_unquote() {}
+  Create_func_json_unquote() = default;
+  virtual ~Create_func_json_unquote() = default;
 };
 
 
@@ -1293,8 +1293,8 @@ public:
   static Create_func_last_day s_singleton;
 
 protected:
-  Create_func_last_day() {}
-  virtual ~Create_func_last_day() {}
+  Create_func_last_day() = default;
+  virtual ~Create_func_last_day() = default;
 };
 
 
@@ -1307,8 +1307,8 @@ public:
   static Create_func_last_insert_id s_singleton;
 
 protected:
-  Create_func_last_insert_id() {}
-  virtual ~Create_func_last_insert_id() {}
+  Create_func_last_insert_id() = default;
+  virtual ~Create_func_last_insert_id() = default;
 };
 
 
@@ -1320,8 +1320,8 @@ public:
   static Create_func_lcase s_singleton;
 
 protected:
-  Create_func_lcase() {}
-  virtual ~Create_func_lcase() {}
+  Create_func_lcase() = default;
+  virtual ~Create_func_lcase() = default;
 };
 
 
@@ -1334,8 +1334,8 @@ public:
   static Create_func_least s_singleton;
 
 protected:
-  Create_func_least() {}
-  virtual ~Create_func_least() {}
+  Create_func_least() = default;
+  virtual ~Create_func_least() = default;
 };
 
 
@@ -1347,8 +1347,8 @@ public:
   static Create_func_length s_singleton;
 
 protected:
-  Create_func_length() {}
-  virtual ~Create_func_length() {}
+  Create_func_length() = default;
+  virtual ~Create_func_length() = default;
 };
 
 class Create_func_octet_length : public Create_func_arg1
@@ -1359,8 +1359,8 @@ public:
   static Create_func_octet_length s_singleton;
 
 protected:
-  Create_func_octet_length() {}
-  virtual ~Create_func_octet_length() {}
+  Create_func_octet_length() = default;
+  virtual ~Create_func_octet_length() = default;
 };
 
 
@@ -1373,8 +1373,8 @@ public:
   static Create_func_like_range_min s_singleton;
 
 protected:
-  Create_func_like_range_min() {}
-  virtual ~Create_func_like_range_min() {}
+  Create_func_like_range_min() = default;
+  virtual ~Create_func_like_range_min() = default;
 };
 
 
@@ -1386,8 +1386,8 @@ public:
   static Create_func_like_range_max s_singleton;
 
 protected:
-  Create_func_like_range_max() {}
-  virtual ~Create_func_like_range_max() {}
+  Create_func_like_range_max() = default;
+  virtual ~Create_func_like_range_max() = default;
 };
 #endif
 
@@ -1400,8 +1400,8 @@ public:
   static Create_func_ln s_singleton;
 
 protected:
-  Create_func_ln() {}
-  virtual ~Create_func_ln() {}
+  Create_func_ln() = default;
+  virtual ~Create_func_ln() = default;
 };
 
 
@@ -1413,8 +1413,8 @@ public:
   static Create_func_load_file s_singleton;
 
 protected:
-  Create_func_load_file() {}
-  virtual ~Create_func_load_file() {}
+  Create_func_load_file() = default;
+  virtual ~Create_func_load_file() = default;
 };
 
 
@@ -1427,8 +1427,8 @@ public:
   static Create_func_locate s_singleton;
 
 protected:
-  Create_func_locate() {}
-  virtual ~Create_func_locate() {}
+  Create_func_locate() = default;
+  virtual ~Create_func_locate() = default;
 };
 
 
@@ -1441,8 +1441,8 @@ public:
   static Create_func_log s_singleton;
 
 protected:
-  Create_func_log() {}
-  virtual ~Create_func_log() {}
+  Create_func_log() = default;
+  virtual ~Create_func_log() = default;
 };
 
 
@@ -1454,8 +1454,8 @@ public:
   static Create_func_log10 s_singleton;
 
 protected:
-  Create_func_log10() {}
-  virtual ~Create_func_log10() {}
+  Create_func_log10() = default;
+  virtual ~Create_func_log10() = default;
 };
 
 
@@ -1467,8 +1467,8 @@ public:
   static Create_func_log2 s_singleton;
 
 protected:
-  Create_func_log2() {}
-  virtual ~Create_func_log2() {}
+  Create_func_log2() = default;
+  virtual ~Create_func_log2() = default;
 };
 
 
@@ -1485,8 +1485,8 @@ public:
   static Create_func_lpad s_singleton;
 
 protected:
-  Create_func_lpad() {}
-  virtual ~Create_func_lpad() {}
+  Create_func_lpad() = default;
+  virtual ~Create_func_lpad() = default;
   Item *create_native_std(THD *thd, const LEX_CSTRING *name,
                           List<Item> *items);
   Item *create_native_oracle(THD *thd, const LEX_CSTRING *name,
@@ -1514,8 +1514,8 @@ public:
   static Create_func_ltrim s_singleton;
 
 protected:
-  Create_func_ltrim() {}
-  virtual ~Create_func_ltrim() {}
+  Create_func_ltrim() = default;
+  virtual ~Create_func_ltrim() = default;
 };
 
 
@@ -1527,8 +1527,8 @@ public:
   static Create_func_ltrim_oracle s_singleton;
 
 protected:
-  Create_func_ltrim_oracle() {}
-  virtual ~Create_func_ltrim_oracle() {}
+  Create_func_ltrim_oracle() = default;
+  virtual ~Create_func_ltrim_oracle() = default;
 };
 
 
@@ -1540,8 +1540,8 @@ public:
   static Create_func_makedate s_singleton;
 
 protected:
-  Create_func_makedate() {}
-  virtual ~Create_func_makedate() {}
+  Create_func_makedate() = default;
+  virtual ~Create_func_makedate() = default;
 };
 
 
@@ -1553,8 +1553,8 @@ public:
   static Create_func_maketime s_singleton;
 
 protected:
-  Create_func_maketime() {}
-  virtual ~Create_func_maketime() {}
+  Create_func_maketime() = default;
+  virtual ~Create_func_maketime() = default;
 };
 
 
@@ -1567,8 +1567,8 @@ public:
   static Create_func_make_set s_singleton;
 
 protected:
-  Create_func_make_set() {}
-  virtual ~Create_func_make_set() {}
+  Create_func_make_set() = default;
+  virtual ~Create_func_make_set() = default;
 };
 
 
@@ -1581,8 +1581,8 @@ public:
   static Create_func_master_pos_wait s_singleton;
 
 protected:
-  Create_func_master_pos_wait() {}
-  virtual ~Create_func_master_pos_wait() {}
+  Create_func_master_pos_wait() = default;
+  virtual ~Create_func_master_pos_wait() = default;
 };
 
 
@@ -1595,8 +1595,8 @@ public:
   static Create_func_master_gtid_wait s_singleton;
 
 protected:
-  Create_func_master_gtid_wait() {}
-  virtual ~Create_func_master_gtid_wait() {}
+  Create_func_master_gtid_wait() = default;
+  virtual ~Create_func_master_gtid_wait() = default;
 };
 
 
@@ -1608,8 +1608,8 @@ public:
   static Create_func_md5 s_singleton;
 
 protected:
-  Create_func_md5() {}
-  virtual ~Create_func_md5() {}
+  Create_func_md5() = default;
+  virtual ~Create_func_md5() = default;
 };
 
 
@@ -1621,8 +1621,8 @@ public:
   static Create_func_monthname s_singleton;
 
 protected:
-  Create_func_monthname() {}
-  virtual ~Create_func_monthname() {}
+  Create_func_monthname() = default;
+  virtual ~Create_func_monthname() = default;
 };
 
 
@@ -1634,8 +1634,8 @@ public:
   static Create_func_name_const s_singleton;
 
 protected:
-  Create_func_name_const() {}
-  virtual ~Create_func_name_const() {}
+  Create_func_name_const() = default;
+  virtual ~Create_func_name_const() = default;
 };
 
 
@@ -1647,8 +1647,8 @@ public:
   static Create_func_nullif s_singleton;
 
 protected:
-  Create_func_nullif() {}
-  virtual ~Create_func_nullif() {}
+  Create_func_nullif() = default;
+  virtual ~Create_func_nullif() = default;
 };
 
 
@@ -1660,8 +1660,8 @@ public:
   static Create_func_oct s_singleton;
 
 protected:
-  Create_func_oct() {}
-  virtual ~Create_func_oct() {}
+  Create_func_oct() = default;
+  virtual ~Create_func_oct() = default;
 };
 
 
@@ -1673,8 +1673,8 @@ public:
   static Create_func_ord s_singleton;
 
 protected:
-  Create_func_ord() {}
-  virtual ~Create_func_ord() {}
+  Create_func_ord() = default;
+  virtual ~Create_func_ord() = default;
 };
 
 
@@ -1686,8 +1686,8 @@ public:
   static Create_func_period_add s_singleton;
 
 protected:
-  Create_func_period_add() {}
-  virtual ~Create_func_period_add() {}
+  Create_func_period_add() = default;
+  virtual ~Create_func_period_add() = default;
 };
 
 
@@ -1699,8 +1699,8 @@ public:
   static Create_func_period_diff s_singleton;
 
 protected:
-  Create_func_period_diff() {}
-  virtual ~Create_func_period_diff() {}
+  Create_func_period_diff() = default;
+  virtual ~Create_func_period_diff() = default;
 };
 
 
@@ -1712,8 +1712,8 @@ public:
   static Create_func_pi s_singleton;
 
 protected:
-  Create_func_pi() {}
-  virtual ~Create_func_pi() {}
+  Create_func_pi() = default;
+  virtual ~Create_func_pi() = default;
 };
 
 
@@ -1725,8 +1725,8 @@ public:
   static Create_func_pow s_singleton;
 
 protected:
-  Create_func_pow() {}
-  virtual ~Create_func_pow() {}
+  Create_func_pow() = default;
+  virtual ~Create_func_pow() = default;
 };
 
 
@@ -1738,8 +1738,8 @@ public:
   static Create_func_quote s_singleton;
 
 protected:
-  Create_func_quote() {}
-  virtual ~Create_func_quote() {}
+  Create_func_quote() = default;
+  virtual ~Create_func_quote() = default;
 };
 
 
@@ -1751,8 +1751,8 @@ public:
   static Create_func_regexp_instr s_singleton;
 
 protected:
-  Create_func_regexp_instr() {}
-  virtual ~Create_func_regexp_instr() {}
+  Create_func_regexp_instr() = default;
+  virtual ~Create_func_regexp_instr() = default;
 };
 
 
@@ -1764,8 +1764,8 @@ public:
   static Create_func_regexp_replace s_singleton;
 
 protected:
-  Create_func_regexp_replace() {}
-  virtual ~Create_func_regexp_replace() {}
+  Create_func_regexp_replace() = default;
+  virtual ~Create_func_regexp_replace() = default;
 };
 
 
@@ -1777,8 +1777,8 @@ public:
   static Create_func_regexp_substr s_singleton;
 
 protected:
-  Create_func_regexp_substr() {}
-  virtual ~Create_func_regexp_substr() {}
+  Create_func_regexp_substr() = default;
+  virtual ~Create_func_regexp_substr() = default;
 };
 
 
@@ -1790,8 +1790,8 @@ public:
   static Create_func_radians s_singleton;
 
 protected:
-  Create_func_radians() {}
-  virtual ~Create_func_radians() {}
+  Create_func_radians() = default;
+  virtual ~Create_func_radians() = default;
 };
 
 
@@ -1804,8 +1804,8 @@ public:
   static Create_func_rand s_singleton;
 
 protected:
-  Create_func_rand() {}
-  virtual ~Create_func_rand() {}
+  Create_func_rand() = default;
+  virtual ~Create_func_rand() = default;
 };
 
 
@@ -1826,8 +1826,8 @@ public:
   static Create_func_release_lock s_singleton;
 
 protected:
-  Create_func_release_lock() {}
-  virtual ~Create_func_release_lock() {}
+  Create_func_release_lock() = default;
+  virtual ~Create_func_release_lock() = default;
 };
 
 
@@ -1839,8 +1839,8 @@ public:
   static Create_func_replace_oracle s_singleton;
 
 protected:
-  Create_func_replace_oracle() {}
-  virtual ~Create_func_replace_oracle() {}
+  Create_func_replace_oracle() = default;
+  virtual ~Create_func_replace_oracle() = default;
 };
 
 
@@ -1852,8 +1852,8 @@ public:
   static Create_func_reverse s_singleton;
 
 protected:
-  Create_func_reverse() {}
-  virtual ~Create_func_reverse() {}
+  Create_func_reverse() = default;
+  virtual ~Create_func_reverse() = default;
 };
 
 
@@ -1866,8 +1866,8 @@ public:
   static Create_func_round s_singleton;
 
 protected:
-  Create_func_round() {}
-  virtual ~Create_func_round() {}
+  Create_func_round() = default;
+  virtual ~Create_func_round() = default;
 };
 
 
@@ -1884,8 +1884,8 @@ public:
   static Create_func_rpad s_singleton;
 
 protected:
-  Create_func_rpad() {}
-  virtual ~Create_func_rpad() {}
+  Create_func_rpad() = default;
+  virtual ~Create_func_rpad() = default;
   Item *create_native_std(THD *thd, const LEX_CSTRING *name,
                           List<Item> *items);
   Item *create_native_oracle(THD *thd, const LEX_CSTRING *name,
@@ -1913,8 +1913,8 @@ public:
   static Create_func_rtrim s_singleton;
 
 protected:
-  Create_func_rtrim() {}
-  virtual ~Create_func_rtrim() {}
+  Create_func_rtrim() = default;
+  virtual ~Create_func_rtrim() = default;
 };
 
 
@@ -1926,8 +1926,8 @@ public:
   static Create_func_rtrim_oracle s_singleton;
 
 protected:
-  Create_func_rtrim_oracle() {}
-  virtual ~Create_func_rtrim_oracle() {}
+  Create_func_rtrim_oracle() = default;
+  virtual ~Create_func_rtrim_oracle() = default;
 };
 
 
@@ -1939,8 +1939,8 @@ public:
   static Create_func_sec_to_time s_singleton;
 
 protected:
-  Create_func_sec_to_time() {}
-  virtual ~Create_func_sec_to_time() {}
+  Create_func_sec_to_time() = default;
+  virtual ~Create_func_sec_to_time() = default;
 };
 
 
@@ -1952,8 +1952,8 @@ public:
   static Create_func_sha s_singleton;
 
 protected:
-  Create_func_sha() {}
-  virtual ~Create_func_sha() {}
+  Create_func_sha() = default;
+  virtual ~Create_func_sha() = default;
 };
 
 
@@ -1965,8 +1965,8 @@ public:
   static Create_func_sha2 s_singleton;
 
 protected:
-  Create_func_sha2() {}
-  virtual ~Create_func_sha2() {}
+  Create_func_sha2() = default;
+  virtual ~Create_func_sha2() = default;
 };
 
 
@@ -1978,8 +1978,8 @@ public:
   static Create_func_sign s_singleton;
 
 protected:
-  Create_func_sign() {}
-  virtual ~Create_func_sign() {}
+  Create_func_sign() = default;
+  virtual ~Create_func_sign() = default;
 };
 
 
@@ -1991,8 +1991,8 @@ public:
   static Create_func_sin s_singleton;
 
 protected:
-  Create_func_sin() {}
-  virtual ~Create_func_sin() {}
+  Create_func_sin() = default;
+  virtual ~Create_func_sin() = default;
 };
 
 
@@ -2004,8 +2004,8 @@ public:
   static Create_func_sleep s_singleton;
 
 protected:
-  Create_func_sleep() {}
-  virtual ~Create_func_sleep() {}
+  Create_func_sleep() = default;
+  virtual ~Create_func_sleep() = default;
 };
 
 
@@ -2017,8 +2017,8 @@ public:
   static Create_func_soundex s_singleton;
 
 protected:
-  Create_func_soundex() {}
-  virtual ~Create_func_soundex() {}
+  Create_func_soundex() = default;
+  virtual ~Create_func_soundex() = default;
 };
 
 
@@ -2030,8 +2030,8 @@ public:
   static Create_func_space s_singleton;
 
 protected:
-  Create_func_space() {}
-  virtual ~Create_func_space() {}
+  Create_func_space() = default;
+  virtual ~Create_func_space() = default;
 };
 
 
@@ -2043,8 +2043,8 @@ public:
   static Create_func_sqrt s_singleton;
 
 protected:
-  Create_func_sqrt() {}
-  virtual ~Create_func_sqrt() {}
+  Create_func_sqrt() = default;
+  virtual ~Create_func_sqrt() = default;
 };
 
 
@@ -2056,8 +2056,8 @@ public:
   static Create_func_str_to_date s_singleton;
 
 protected:
-  Create_func_str_to_date() {}
-  virtual ~Create_func_str_to_date() {}
+  Create_func_str_to_date() = default;
+  virtual ~Create_func_str_to_date() = default;
 };
 
 
@@ -2069,8 +2069,8 @@ public:
   static Create_func_strcmp s_singleton;
 
 protected:
-  Create_func_strcmp() {}
-  virtual ~Create_func_strcmp() {}
+  Create_func_strcmp() = default;
+  virtual ~Create_func_strcmp() = default;
 };
 
 
@@ -2082,8 +2082,8 @@ public:
   static Create_func_substr_index s_singleton;
 
 protected:
-  Create_func_substr_index() {}
-  virtual ~Create_func_substr_index() {}
+  Create_func_substr_index() = default;
+  virtual ~Create_func_substr_index() = default;
 };
 
 
@@ -2096,8 +2096,8 @@ public:
   static Create_func_substr_oracle s_singleton;
 
 protected:
-  Create_func_substr_oracle() {}
-  virtual ~Create_func_substr_oracle() {}
+  Create_func_substr_oracle() = default;
+  virtual ~Create_func_substr_oracle() = default;
 };
 
 
@@ -2109,8 +2109,8 @@ public:
   static Create_func_subtime s_singleton;
 
 protected:
-  Create_func_subtime() {}
-  virtual ~Create_func_subtime() {}
+  Create_func_subtime() = default;
+  virtual ~Create_func_subtime() = default;
 };
 
 
@@ -2122,8 +2122,8 @@ public:
   static Create_func_tan s_singleton;
 
 protected:
-  Create_func_tan() {}
-  virtual ~Create_func_tan() {}
+  Create_func_tan() = default;
+  virtual ~Create_func_tan() = default;
 };
 
 
@@ -2135,8 +2135,8 @@ public:
   static Create_func_time_format s_singleton;
 
 protected:
-  Create_func_time_format() {}
-  virtual ~Create_func_time_format() {}
+  Create_func_time_format() = default;
+  virtual ~Create_func_time_format() = default;
 };
 
 
@@ -2148,8 +2148,8 @@ public:
   static Create_func_time_to_sec s_singleton;
 
 protected:
-  Create_func_time_to_sec() {}
-  virtual ~Create_func_time_to_sec() {}
+  Create_func_time_to_sec() = default;
+  virtual ~Create_func_time_to_sec() = default;
 };
 
 
@@ -2161,8 +2161,8 @@ public:
   static Create_func_timediff s_singleton;
 
 protected:
-  Create_func_timediff() {}
-  virtual ~Create_func_timediff() {}
+  Create_func_timediff() = default;
+  virtual ~Create_func_timediff() = default;
 };
 
 
@@ -2174,8 +2174,8 @@ public:
   static Create_func_to_base64 s_singleton;
 
 protected:
-  Create_func_to_base64() {}
-  virtual ~Create_func_to_base64() {}
+  Create_func_to_base64() = default;
+  virtual ~Create_func_to_base64() = default;
 };
 
 
@@ -2187,8 +2187,8 @@ public:
   static Create_func_to_days s_singleton;
 
 protected:
-  Create_func_to_days() {}
-  virtual ~Create_func_to_days() {}
+  Create_func_to_days() = default;
+  virtual ~Create_func_to_days() = default;
 };
 
 class Create_func_to_seconds : public Create_func_arg1
@@ -2199,8 +2199,8 @@ public:
   static Create_func_to_seconds s_singleton;
 
 protected:
-  Create_func_to_seconds() {}
-  virtual ~Create_func_to_seconds() {}
+  Create_func_to_seconds() = default;
+  virtual ~Create_func_to_seconds() = default;
 };
 
 
@@ -2212,8 +2212,8 @@ public:
   static Create_func_ucase s_singleton;
 
 protected:
-  Create_func_ucase() {}
-  virtual ~Create_func_ucase() {}
+  Create_func_ucase() = default;
+  virtual ~Create_func_ucase() = default;
 };
 
 
@@ -2225,8 +2225,8 @@ public:
   static Create_func_uncompress s_singleton;
 
 protected:
-  Create_func_uncompress() {}
-  virtual ~Create_func_uncompress() {}
+  Create_func_uncompress() = default;
+  virtual ~Create_func_uncompress() = default;
 };
 
 
@@ -2238,8 +2238,8 @@ public:
   static Create_func_uncompressed_length s_singleton;
 
 protected:
-  Create_func_uncompressed_length() {}
-  virtual ~Create_func_uncompressed_length() {}
+  Create_func_uncompressed_length() = default;
+  virtual ~Create_func_uncompressed_length() = default;
 };
 
 
@@ -2251,8 +2251,8 @@ public:
   static Create_func_unhex s_singleton;
 
 protected:
-  Create_func_unhex() {}
-  virtual ~Create_func_unhex() {}
+  Create_func_unhex() = default;
+  virtual ~Create_func_unhex() = default;
 };
 
 
@@ -2265,8 +2265,8 @@ public:
   static Create_func_unix_timestamp s_singleton;
 
 protected:
-  Create_func_unix_timestamp() {}
-  virtual ~Create_func_unix_timestamp() {}
+  Create_func_unix_timestamp() = default;
+  virtual ~Create_func_unix_timestamp() = default;
 };
 
 
@@ -2278,8 +2278,8 @@ public:
   static Create_func_uuid s_singleton;
 
 protected:
-  Create_func_uuid() {}
-  virtual ~Create_func_uuid() {}
+  Create_func_uuid() = default;
+  virtual ~Create_func_uuid() = default;
 };
 
 
@@ -2291,8 +2291,8 @@ public:
   static Create_func_uuid_short s_singleton;
 
 protected:
-  Create_func_uuid_short() {}
-  virtual ~Create_func_uuid_short() {}
+  Create_func_uuid_short() = default;
+  virtual ~Create_func_uuid_short() = default;
 };
 
 
@@ -2304,8 +2304,8 @@ public:
   static Create_func_version s_singleton;
 
 protected:
-  Create_func_version() {}
-  virtual ~Create_func_version() {}
+  Create_func_version() = default;
+  virtual ~Create_func_version() = default;
 };
 
 
@@ -2317,8 +2317,8 @@ public:
   static Create_func_weekday s_singleton;
 
 protected:
-  Create_func_weekday() {}
-  virtual ~Create_func_weekday() {}
+  Create_func_weekday() = default;
+  virtual ~Create_func_weekday() = default;
 };
 
 
@@ -2330,8 +2330,8 @@ public:
   static Create_func_weekofyear s_singleton;
 
 protected:
-  Create_func_weekofyear() {}
-  virtual ~Create_func_weekofyear() {}
+  Create_func_weekofyear() = default;
+  virtual ~Create_func_weekofyear() = default;
 };
 
 
@@ -2344,8 +2344,8 @@ public:
   static Create_func_wsrep_last_written_gtid s_singleton;
 
 protected:
-  Create_func_wsrep_last_written_gtid() {}
-  virtual ~Create_func_wsrep_last_written_gtid() {}
+  Create_func_wsrep_last_written_gtid() = default;
+  virtual ~Create_func_wsrep_last_written_gtid() = default;
 };
 
 
@@ -2357,8 +2357,8 @@ public:
   static Create_func_wsrep_last_seen_gtid s_singleton;
 
 protected:
-  Create_func_wsrep_last_seen_gtid() {}
-  virtual ~Create_func_wsrep_last_seen_gtid() {}
+  Create_func_wsrep_last_seen_gtid() = default;
+  virtual ~Create_func_wsrep_last_seen_gtid() = default;
 };
 
 
@@ -2371,8 +2371,8 @@ public:
   static Create_func_wsrep_sync_wait_upto s_singleton;
 
 protected:
-  Create_func_wsrep_sync_wait_upto() {}
-  virtual ~Create_func_wsrep_sync_wait_upto() {}
+  Create_func_wsrep_sync_wait_upto() = default;
+  virtual ~Create_func_wsrep_sync_wait_upto() = default;
 };
 #endif /* WITH_WSREP */
 
@@ -2385,8 +2385,8 @@ public:
   static Create_func_xml_extractvalue s_singleton;
 
 protected:
-  Create_func_xml_extractvalue() {}
-  virtual ~Create_func_xml_extractvalue() {}
+  Create_func_xml_extractvalue() = default;
+  virtual ~Create_func_xml_extractvalue() = default;
 };
 
 
@@ -2398,8 +2398,8 @@ public:
   static Create_func_xml_update s_singleton;
 
 protected:
-  Create_func_xml_update() {}
-  virtual ~Create_func_xml_update() {}
+  Create_func_xml_update() = default;
+  virtual ~Create_func_xml_update() = default;
 };
 
 
@@ -2412,8 +2412,8 @@ public:
   static Create_func_year_week s_singleton;
 
 protected:
-  Create_func_year_week() {}
-  virtual ~Create_func_year_week() {}
+  Create_func_year_week() = default;
+  virtual ~Create_func_year_week() = default;
 };