diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-12 14:30:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-12 14:30:34 +0300 |
| commit | f09f1c7c7da344d0078b2c13edc9249c4c61c6b9 (patch) | |
| tree | 1b707c9edf2d159102019147a5dbca390e1aac83 /include/my_time.h | |
| parent | f34be1893892745b5b1a7a099eab4ad8e9ac8641 (diff) | |
| parent | 4c81cef75d7871e2c77d6723813ac328c34603b5 (diff) | |
| download | mariadb-git-f09f1c7c7da344d0078b2c13edc9249c4c61c6b9.tar.gz | |
Merge with dynamic column code
Diffstat (limited to 'include/my_time.h')
| -rw-r--r-- | include/my_time.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h index 0bbb83b78b7..1269cd649ee 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -85,6 +85,7 @@ typedef long my_time_t; TIME_MAX_SECOND) #define TIME_MAX_VALUE_SECONDS (TIME_MAX_HOUR * 3600L + \ TIME_MAX_MINUTE * 60L + TIME_MAX_SECOND) +#define TIME_SUBSECOND_RANGE 1000000 my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, ulong flags, int *was_cut); @@ -93,6 +94,8 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, uint flags, int *was_cut); longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res, uint flags, int *was_cut); +my_bool double_to_datetime(double nr, MYSQL_TIME *time_res, + uint flags); ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *); ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *); ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *); @@ -100,7 +103,7 @@ ulonglong TIME_to_ulonglong(const MYSQL_TIME *); my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, - int *warning); + ulong flag,int *warning); int check_time_range(struct st_mysql_time *, int *warning); |