diff options
| author | msvensson@shellback.(none) <> | 2006-11-29 15:44:09 +0100 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-11-29 15:44:09 +0100 |
| commit | 7ddc43e30596246effffa5944c23d019120f8dda (patch) | |
| tree | 9a20c4415bb69ebb31576302a0e46beb9863997e /sql-common/my_time.c | |
| parent | ebee55f48a09c3971192beeb122d3fff17794ba6 (diff) | |
| parent | 40684173ad1c4a0a64c8c5bccc0ac9ff1009d8bf (diff) | |
| download | mariadb-git-7ddc43e30596246effffa5944c23d019120f8dda.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-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 839bae51d64..1282cfd95e0 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 */ |