diff options
| author | msvensson@neptunus.(none) <> | 2006-11-28 20:59:57 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-28 20:59:57 +0100 |
| commit | 04d5a42bbfb36e614512d692a34130242d345175 (patch) | |
| tree | abd103946cab0eae83e36388b799bb0e86227ee3 /sql-common/my_time.c | |
| parent | cc2821944fcceb54080230acb057c627a5c288ed (diff) | |
| parent | 648e86e10849f5d31c9592d6173ac8f1c2b453aa (diff) | |
| download | mariadb-git-04d5a42bbfb36e614512d692a34130242d345175.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 403c645af0b..e1eedd7ce77 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -76,8 +76,8 @@ uint calc_days_in_year(uint year) 1 error */ -static my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, - ulong flags, int *was_cut) +my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, + ulong flags, int *was_cut) { if (not_zero_date) { @@ -965,7 +965,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, */ if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE)) tmp= 0; -end: + return (my_time_t) tmp; } /* my_system_gmt_sec */ |