diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
commit | 6aec87544c675751141100d6efe3a2d943cb528f (patch) | |
tree | 8771c79790e0b58df172e48214a5077899a9b312 /sql/sql_lex.h | |
parent | 70a515df434a57709eaf69f451c22739d7908ba4 (diff) | |
parent | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (diff) | |
download | mariadb-git-6aec87544c675751141100d6efe3a2d943cb528f.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 07380831b18..6ca2159e80f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1754,8 +1754,8 @@ public: These constructor and destructor serve for creation/destruction of Query_tables_list instances which are used as backup storage. */ - Query_tables_list() {} - ~Query_tables_list() {} + Query_tables_list() = default; + ~Query_tables_list() = default; /* Initializes (or resets) Query_tables_list object for "real" use. */ void reset_query_tables_list(bool init); @@ -2420,13 +2420,9 @@ class Lex_input_stream const char *str, const char *end, int sep); my_charset_conv_wc_mb get_escape_func(THD *thd, my_wc_t sep) const; public: - Lex_input_stream() - { - } + Lex_input_stream() = default; - ~Lex_input_stream() - { - } + ~Lex_input_stream() = default; /** Object initializer. Must be called before usage. @@ -3009,7 +3005,7 @@ public: protected: bool save_explain_data_intern(MEM_ROOT *mem_root, Explain_update *eu, bool is_analyze); public: - virtual ~Update_plan() {} + virtual ~Update_plan() = default; Update_plan(MEM_ROOT *mem_root_arg) : impossible_where(false), no_partitions(false), @@ -3063,7 +3059,7 @@ enum password_exp_type struct Account_options: public USER_RESOURCES { - Account_options() { } + Account_options() = default; void reset() { @@ -4836,14 +4832,13 @@ class Set_signal_information { public: /** Empty default constructor, use clear() */ - Set_signal_information() {} + Set_signal_information() = default; /** Copy constructor. */ Set_signal_information(const Set_signal_information& set); /** Destructor. */ - ~Set_signal_information() - {} + ~Set_signal_information() = default; /** Clear all items. */ void clear(); @@ -4966,8 +4961,7 @@ public: return m_lip.init(thd, buff, length); } - ~Parser_state() - {} + ~Parser_state() = default; Lex_input_stream m_lip; Yacc_state m_yacc; |