diff options
| author | monty@mishka.local <> | 2005-07-31 21:09:18 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2005-07-31 21:09:18 +0300 |
| commit | 585da2f6fd83053c8fd4f62bd60b6f58b6a4e0c4 (patch) | |
| tree | c38330d5c3f5211e8d26852b696aa7dd6fb15ea6 /include/my_time.h | |
| parent | 9ee6e8c1478b6a28318732e4663818f45bfb43bd (diff) | |
| parent | e73d6c25fdff7368831907f1fbea98e26e333040 (diff) | |
| download | mariadb-git-585da2f6fd83053c8fd4f62bd60b6f58b6a4e0c4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
Diffstat (limited to 'include/my_time.h')
| -rw-r--r-- | include/my_time.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/my_time.h b/include/my_time.h index aa68a6f0bbd..e52ef69475d 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -60,8 +60,8 @@ ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time); ulonglong TIME_to_ulonglong(const MYSQL_TIME *time); -bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time, - int *was_cut); +my_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); uint calc_days_in_year(uint year); @@ -69,7 +69,8 @@ uint calc_days_in_year(uint year); void init_time(void); my_time_t -my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap); +my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, + my_bool *in_dst_time_gap); void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type); |