diff options
| author | unknown <guilhem@mysql.com> | 2004-07-29 23:28:28 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-07-29 23:28:28 +0200 |
| commit | e59c85f8f5c15198ba79b67159fee451d45b64c4 (patch) | |
| tree | 48229c969d00cb768a0fdaf0a6be2bcd0b371cbf /include | |
| parent | 2dc386ffe7bfb0c5b4edc8ca5337489a6608b42c (diff) | |
| parent | 5296a9bf295e62e64763e8b4e39fc4dd59862c24 (diff) | |
| download | mariadb-git-e59c85f8f5c15198ba79b67159fee451d45b64c4.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
client/mysqlbinlog.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 7 | ||||
| -rw-r--r-- | include/mysql_time.h | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/my_time.h b/include/my_time.h index e42f7e9e402..1212f0533e2 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -41,6 +41,13 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, int *was_cut); +long calc_daynr(uint year,uint month,uint day); + +void init_time(void); + +my_time_t +my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap); + C_MODE_END #endif /* _my_time_h_ */ diff --git a/include/mysql_time.h b/include/mysql_time.h index 943d018fc14..32da27ba33e 100644 --- a/include/mysql_time.h +++ b/include/mysql_time.h @@ -34,4 +34,13 @@ typedef struct st_mysql_time enum enum_mysql_timestamp_type time_type; } MYSQL_TIME; + +/* + Portable time_t replacement. + Should be signed and hold seconds for 1902-2038 range. +*/ +typedef long my_time_t; +#define MY_TIME_T_MAX LONG_MAX +#define MY_TIME_T_MIN LONG_MIN + #endif /* _mysql_time_h_ */ |