diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:13:28 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 20:13:28 +0200 |
| commit | fe145b0900d8006310232e2edb4137c04c116702 (patch) | |
| tree | 12d9c3f5bea6c6481050211f64ad22118d925c93 /sql-common | |
| parent | d98270e1a39c5c9d40b9d3fbca7d8a3ebeb92ccc (diff) | |
| parent | 72ae1d65dd62f1e2cc308549a84a46feadd158f4 (diff) | |
| download | mariadb-git-fe145b0900d8006310232e2edb4137c04c116702.tar.gz | |
merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 38384600fc1..39eee57a1c0 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -992,7 +992,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, with unsigned time_t tmp+= shift*86400L might result in a number, larger then TIMESTAMP_MAX_VALUE, so another check will work. */ - if ((tmp < TIMESTAMP_MIN_VALUE) || (tmp > TIMESTAMP_MAX_VALUE)) + if (!IS_TIME_T_VALID_FOR_TIMESTAMP(tmp)) tmp= 0; return (my_time_t) tmp; |