diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 12:02:11 +0200 |
commit | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (patch) | |
tree | 5d05c0591e7deef310800a1952a067ad6ad74777 /sql/structs.h | |
parent | a9eb272f9147b2889b95b3f53353e1c735defaba (diff) | |
parent | cacea31687c098c0348deb1e433f4baddd817419 (diff) | |
download | mariadb-git-c41c79650aa2ef8eaf3f887b94db8cc7478eadd1.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/structs.h')
-rw-r--r-- | sql/structs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/structs.h b/sql/structs.h index 17c6ea9d2c3..ecdf808f613 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -855,7 +855,7 @@ public: class Load_data_outvar { public: - virtual ~Load_data_outvar() {} + virtual ~Load_data_outvar() = default; virtual bool load_data_set_null(THD *thd, const Load_data_param *param)= 0; virtual bool load_data_set_value(THD *thd, const char *pos, uint length, const Load_data_param *param)= 0; @@ -869,7 +869,7 @@ public: class Timeval: public timeval { protected: - Timeval() { } + Timeval() = default; public: Timeval(my_time_t sec, ulong usec) { |