diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-06-14 18:17:26 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-06-14 18:17:26 -0400 |
| commit | 85caa3540e6e42242ffb9336788f1d3d00127075 (patch) | |
| tree | 72e7c1a8261bde33ec6c4ca60f1474482de94771 /sql/tztime.h | |
| parent | d37e579411b446ff184cf8af239faf636ff85050 (diff) | |
| parent | c67c49fff0fc58199416177fb69fd166b726e93a (diff) | |
| download | mariadb-git-85caa3540e6e42242ffb9336788f1d3d00127075.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/tztime.h')
| -rw-r--r-- | sql/tztime.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/tztime.h b/sql/tztime.h index d1f33843810..32a942a26e1 100644 --- a/sql/tztime.h +++ b/sql/tztime.h @@ -22,7 +22,7 @@ /* This class represents abstract time zone and provides - basic interface for TIME <-> my_time_t conversion. + basic interface for MYSQL_TIME <-> my_time_t conversion. Actual time zones which are specified by DB, or via offset or use system functions are its descendants. */ @@ -31,18 +31,18 @@ class Time_zone: public Sql_alloc public: Time_zone() {} /* Remove gcc warning */ /* - Converts local time in broken down TIME representation to + Converts local time in broken down MYSQL_TIME representation to my_time_t (UTC seconds since Epoch) represenation. Returns 0 in case of error. Sets in_dst_time_gap to true if date provided falls into spring time-gap (or lefts it untouched otherwise). */ - virtual my_time_t TIME_to_gmt_sec(const TIME *t, + virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, my_bool *in_dst_time_gap) const = 0; /* Converts time in my_time_t representation to local time in - broken down TIME representation. + broken down MYSQL_TIME representation. */ - virtual void gmt_sec_to_TIME(TIME *tmp, my_time_t t) const = 0; + virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const = 0; /* Because of constness of String returned by get_name() time zone name have to be already zeroended to be able to use String::ptr() instead |