1 files changed, 365 insertions, 344 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 73e3befc9d6..dcc64ef10e8 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -90,9 +90,9 @@ public:
 
 protected:
   /** Constructor. */
-  Create_sp_func() {}
+  Create_sp_func() = default;
   /** Destructor. */
-  virtual ~Create_sp_func() {}
+  virtual ~Create_sp_func() = default;
 };
 
 
@@ -110,8 +110,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;
 };
 
 
@@ -123,8 +123,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;
 };
 
 
@@ -136,8 +136,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;
 };
 
 
@@ -149,8 +149,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;
 };
 
 
@@ -162,8 +162,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;
 };
 
 
@@ -175,8 +175,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;
 };
 
 
@@ -189,8 +189,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;
 };
 
 
@@ -202,8 +202,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;
 };
 
 
@@ -215,8 +215,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;
 };
 
 
@@ -228,8 +228,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;
 };
 
 
@@ -241,8 +241,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;
 };
 
 
@@ -254,8 +254,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;
 };
 
 
@@ -267,8 +267,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;
 };
 
 
@@ -280,8 +280,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;
 };
 
 
@@ -293,8 +293,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;
 };
 
 
@@ -306,8 +306,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
@@ -318,8 +318,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
@@ -330,8 +330,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
@@ -342,8 +342,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
@@ -354,8 +354,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;
 };
 
 
@@ -367,8 +367,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;
 };
 
 
@@ -381,8 +381,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;
 };
 
 
@@ -395,8 +395,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;
 };
 
 
@@ -408,8 +408,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;
 };
 
 
@@ -422,8 +422,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;
 };
 
 
@@ -436,8 +436,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;
 };
 
 
@@ -449,8 +449,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;
 };
 
 
@@ -462,8 +462,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;
 };
 
 
@@ -475,8 +475,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;
 };
 
 
@@ -488,8 +488,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;
 };
 
 
@@ -501,8 +501,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;
 };
 
 
@@ -514,8 +514,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;
 };
 
 
@@ -527,8 +527,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;
 };
 
 
@@ -540,8 +540,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;
 };
 
 
@@ -553,8 +553,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;
 };
 
 
@@ -566,8 +566,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;
 };
 
 
@@ -579,8 +579,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;
 };
 
 
@@ -592,8 +592,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;
 };
 
 
@@ -605,8 +605,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;
 };
 
 
@@ -619,8 +619,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;
 };
 
 
@@ -633,8 +633,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;
 };
 
 
@@ -647,8 +647,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;
 };
 
 
@@ -660,8 +660,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;
 };
 
 
@@ -674,8 +674,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;
 };
 
 
@@ -687,8 +687,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;
 };
 
 
@@ -701,8 +701,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;
 };
 
 
@@ -715,8 +715,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;
 };
 
 
@@ -728,8 +728,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;
 };
 
 
@@ -741,8 +741,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;
 };
 
 
@@ -755,8 +755,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;
 };
 
 
@@ -768,8 +768,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;
 };
 
 
@@ -781,8 +781,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;
 };
 
 
@@ -794,8 +794,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;
 };
 
 
@@ -808,8 +808,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;
 };
 
 
@@ -821,8 +821,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;
 };
 
 
@@ -835,8 +835,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;
 };
 
 
@@ -848,8 +848,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;
 };
 
 
@@ -861,8 +861,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;
 };
 
 
@@ -874,8 +874,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;
 };
 
 
@@ -887,8 +887,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;
 };
 
 
@@ -900,8 +900,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;
 };
 
 
@@ -913,8 +913,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;
 };
 
 
@@ -926,8 +926,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;
 };
 
 
@@ -939,8 +939,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;
 };
 
 
@@ -952,8 +952,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;
 };
 
 
@@ -965,8 +965,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;
 };
 
 
@@ -979,8 +979,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;
 };
 
 
@@ -992,8 +992,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;
 };
 
 
@@ -1005,8 +1005,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;
 };
 
 
@@ -1018,8 +1018,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;
 };
 
 
@@ -1031,8 +1031,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;
 };
 
 
@@ -1045,8 +1045,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;
 };
 
 
@@ -1059,8 +1059,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;
 };
 
 
@@ -1073,8 +1073,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;
 };
 
 
@@ -1087,8 +1087,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;
 };
 
 
@@ -1101,8 +1101,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;
 };
 
 
@@ -1115,8 +1115,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;
 };
 
 
@@ -1129,8 +1129,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;
 };
 
 
@@ -1143,8 +1143,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;
 };
 
 
@@ -1157,8 +1157,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;
 };
 
 
@@ -1171,8 +1171,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;
 };
 
 
@@ -1185,8 +1185,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;
 };
 
 
@@ -1199,8 +1199,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;
 };
 
 
@@ -1213,8 +1213,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;
 };
 
 
@@ -1227,8 +1227,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;
 };
 
 
@@ -1241,8 +1241,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;
 };
 
 
@@ -1255,8 +1255,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;
 };
 
 
@@ -1268,8 +1268,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;
 };
 
 
@@ -1281,8 +1281,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;
 };
 
 
@@ -1294,8 +1294,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;
 };
 
 
@@ -1308,8 +1308,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;
 };
 
 
@@ -1321,8 +1321,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;
 };
 
 
@@ -1335,8 +1335,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;
 };
 
 
@@ -1348,8 +1348,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
@@ -1360,8 +1360,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;
 };
 
 
@@ -1374,8 +1374,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;
 };
 
 
@@ -1387,8 +1387,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
 
@@ -1401,8 +1401,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;
 };
 
 
@@ -1414,8 +1414,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;
 };
 
 
@@ -1428,8 +1428,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;
 };
 
 
@@ -1442,8 +1442,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;
 };
 
 
@@ -1455,8 +1455,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;
 };
 
 
@@ -1468,8 +1468,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;
 };
 
 
@@ -1486,8 +1486,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,
@@ -1515,8 +1515,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;
 };
 
 
@@ -1528,8 +1528,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;
 };
 
 
@@ -1541,8 +1541,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;
 };
 
 
@@ -1554,8 +1554,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;
 };
 
 
@@ -1568,8 +1568,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;
 };
 
 
@@ -1582,8 +1582,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;
 };
 
 
@@ -1596,8 +1596,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;
 };
 
 
@@ -1609,8 +1609,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;
 };
 
 
@@ -1622,8 +1622,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;
 };
 
 
@@ -1635,8 +1635,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;
 };
 
 
@@ -1648,8 +1648,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;
 };
 
 
@@ -1661,8 +1661,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;
 };
 
 
@@ -1674,8 +1674,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;
 };
 
 
@@ -1687,8 +1687,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;
 };
 
 
@@ -1700,8 +1700,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;
 };
 
 
@@ -1713,8 +1713,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;
 };
 
 
@@ -1726,8 +1726,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;
 };
 
 
@@ -1739,8 +1739,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;
 };
 
 
@@ -1752,8 +1752,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;
 };
 
 
@@ -1765,8 +1765,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;
 };
 
 
@@ -1778,8 +1778,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;
 };
 
 
@@ -1791,8 +1791,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;
 };
 
 
@@ -1805,8 +1805,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;
 };
 
 
@@ -1827,8 +1827,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;
 };
 
 
@@ -1840,8 +1840,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;
 };
 
 
@@ -1853,8 +1853,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;
 };
 
 
@@ -1867,8 +1867,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;
 };
 
 
@@ -1885,8 +1885,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,
@@ -1914,8 +1914,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;
 };
 
 
@@ -1927,8 +1927,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;
 };
 
 
@@ -1940,8 +1940,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;
 };
 
 
@@ -1953,8 +1953,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;
 };
 
 
@@ -1966,8 +1966,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;
 };
 
 
@@ -1979,8 +1979,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;
 };
 
 
@@ -1992,8 +1992,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;
 };
 
 
@@ -2005,8 +2005,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;
 };
 
 
@@ -2018,8 +2018,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;
 };
 
 
@@ -2031,8 +2031,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;
 };
 
 
@@ -2044,8 +2044,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;
 };
 
 
@@ -2057,8 +2057,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;
 };
 
 
@@ -2070,8 +2070,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;
 };
 
 
@@ -2083,8 +2083,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;
 };
 
 
@@ -2097,8 +2097,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;
 };
 
 
@@ -2110,8 +2110,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;
 };
 
 
@@ -2123,8 +2123,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;
 };
 
 
@@ -2136,8 +2136,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;
 };
 
 
@@ -2149,8 +2149,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;
 };
 
 
@@ -2162,8 +2162,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;
 };
 
 
@@ -2175,8 +2175,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;
 };
 
 
@@ -2202,8 +2202,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
@@ -2214,8 +2214,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;
 };
 
 
@@ -2227,8 +2227,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;
 };
 
 
@@ -2240,8 +2240,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;
 };
 
 
@@ -2253,8 +2253,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;
 };
 
 
@@ -2266,8 +2266,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;
 };
 
 
@@ -2280,8 +2280,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;
 };
 
 
@@ -2293,8 +2293,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;
 };
 
 class Create_func_sys_guid : public Create_func_arg0
@@ -2317,8 +2317,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;
 };
 
 
@@ -2330,8 +2330,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;
 };
 
 
@@ -2343,8 +2343,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;
 };
 
 
@@ -2356,8 +2356,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;
 };
 
 
@@ -2370,8 +2370,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;
 };
 
 
@@ -2383,8 +2383,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;
 };
 
 
@@ -2397,8 +2397,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 */
 
@@ -2411,8 +2411,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;
 };
 
 
@@ -2424,8 +2424,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;
 };
 
 
@@ -2438,8 +2438,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;
 };
 
 
@@ -3573,6 +3573,13 @@ Create_func_get_lock Create_func_get_lock::s_singleton;
 Item*
 Create_func_get_lock::create_2_arg(THD *thd, Item *arg1, Item *arg2)
 {
+#ifdef WITH_WSREP
+  if (WSREP_ON && WSREP(thd))
+  {
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "GET_LOCK in cluster (WSREP_ON=ON)");
+    return NULL;
+  }
+#endif /* WITH_WSREP */
   thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
   thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new (thd->mem_root) Item_func_get_lock(thd, arg1, arg2);
@@ -4862,6 +4869,13 @@ Create_func_release_all_locks Create_func_release_all_locks::s_singleton;
 Item*
 Create_func_release_all_locks::create_builder(THD *thd)
 {
+#ifdef WITH_WSREP
+  if (WSREP_ON && WSREP(thd))
+  {
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RELEASE_ALL_LOCKS in cluster (WSREP_ON=ON)");
+    return NULL;
+  }
+#endif /* WITH_WSREP */
   thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
   thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new (thd->mem_root) Item_func_release_all_locks(thd);
@@ -4873,6 +4887,13 @@ Create_func_release_lock Create_func_release_lock::s_singleton;
 Item*
 Create_func_release_lock::create_1_arg(THD *thd, Item *arg1)
 {
+#ifdef WITH_WSREP
+  if (WSREP_ON && WSREP(thd))
+  {
+    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RELEASE_LOCK in cluster (WSREP_ON=ON)");
+    return NULL;
+  }
+#endif /* WITH_WSREP */
   thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
   thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new (thd->mem_root) Item_func_release_lock(thd, arg1);