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/tztime.cc | |
parent | 29cd17e8d94641f604131af7b4949e29dd34ce2b (diff) | |
parent | 6aec87544c675751141100d6efe3a2d943cb528f (diff) | |
download | mariadb-git-dbab3e8d90e82aead7f3b504784a1334fda69b1d.tar.gz |
Merge 10.6 into 10.8
Diffstat (limited to 'sql/tztime.cc')
-rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 2e39a20fc91..8e1a8805d96 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1027,7 +1027,7 @@ static const String tz_SYSTEM_name("SYSTEM", 6, &my_charset_latin1); class Time_zone_system : public Time_zone { public: - Time_zone_system() {} /* Remove gcc warning */ + Time_zone_system() = default; /* Remove gcc warning */ virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, uint *error_code) const; virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const; virtual const String * get_name() const; @@ -1123,7 +1123,7 @@ Time_zone_system::get_name() const class Time_zone_utc : public Time_zone { public: - Time_zone_utc() {} /* Remove gcc warning */ + Time_zone_utc() = default; /* Remove gcc warning */ virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, uint *error_code) const; virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const; |