diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:43:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:43:53 +0200 |
| commit | dbab3e8d90e82aead7f3b504784a1334fda69b1d (patch) | |
| tree | aaab820a05398735303553f2cc1e479087da70ba /sql/sql_error.h | |
| parent | 29cd17e8d94641f604131af7b4949e29dd34ce2b (diff) | |
| parent | 6aec87544c675751141100d6efe3a2d943cb528f (diff) | |
| download | mariadb-git-dbab3e8d90e82aead7f3b504784a1334fda69b1d.tar.gz | |
Merge 10.6 into 10.8
Diffstat (limited to 'sql/sql_error.h')
| -rw-r--r-- | sql/sql_error.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h index d7c29c5f9a4..541b92b4531 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -245,8 +245,7 @@ class Sql_condition_identity: public Sql_state_errno_level, public Sql_user_condition_identity { public: - Sql_condition_identity() - { } + Sql_condition_identity() = default; Sql_condition_identity(const Sql_state_errno_level &st, const Sql_user_condition_identity &ucid) :Sql_state_errno_level(st), @@ -450,8 +449,7 @@ private: } /** Destructor. */ - ~Sql_condition() - {} + ~Sql_condition() = default; /** Copy optional condition items attributes. @@ -871,8 +869,8 @@ public: class ErrConv: public ErrBuff { public: - ErrConv() {} - virtual ~ErrConv() {} + ErrConv() = default; + virtual ~ErrConv() = default; virtual LEX_CSTRING lex_cstring() const= 0; inline const char *ptr() const { |