diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 19:05:28 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-02 19:05:28 +0200 |
| commit | 72ae1d65dd62f1e2cc308549a84a46feadd158f4 (patch) | |
| tree | 4635605ae0572f713774190b2fe771d0df3a1f96 /sql-common | |
| parent | e805a0fd9de24cf1a9a6fb7bd10a336dbcd46fe9 (diff) | |
| parent | a70c34bf0f34703fd330f8cb828e48b303c5296a (diff) | |
| download | mariadb-git-72ae1d65dd62f1e2cc308549a84a46feadd158f4.tar.gz | |
merge to 5.1.
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 c4e917801d5..ca11c54a999 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; |