diff options
| author | monty@mysql.com <> | 2006-02-25 21:54:34 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-02-25 21:54:34 +0200 |
| commit | 1e2e9e28565d97f140f230824a1adfcea475ee34 (patch) | |
| tree | 69f6c8a1a1bef870aa8b2cbe729b0fd87fcf1c31 /sql/tztime.cc | |
| parent | 066c7148fb5243a0533fd7b6edfe948cb1722548 (diff) | |
| parent | 54274976e7b4a9a28e94a6f0b4f8d064140248db (diff) | |
| download | mariadb-git-1e2e9e28565d97f140f230824a1adfcea475ee34.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 96eb31449da..94c1eb8ac63 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -973,6 +973,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 */ virtual my_time_t TIME_to_gmt_sec(const TIME *t, my_bool *in_dst_time_gap) const; virtual void gmt_sec_to_TIME(TIME *tmp, my_time_t t) const; @@ -1066,6 +1067,7 @@ Time_zone_system::get_name() const class Time_zone_utc : public Time_zone { public: + Time_zone_utc() {} /* Remove gcc warning */ virtual my_time_t TIME_to_gmt_sec(const TIME *t, my_bool *in_dst_time_gap) const; virtual void gmt_sec_to_TIME(TIME *tmp, my_time_t t) const; |