summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-02-02 20:13:28 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-02-02 20:13:28 +0200
commit3b65062d33c7e33ca67e9cc661f572b9c166572a (patch)
tree12d9c3f5bea6c6481050211f64ad22118d925c93 /sql-common
parent9b3884e9d75e5cab146a84875b53c93e454b19d5 (diff)
parentac3243c8c82077c34e99e8f7f9a83e5bc9fd7b66 (diff)
downloadmariadb-git-3b65062d33c7e33ca67e9cc661f572b9c166572a.tar.gz
merge
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/my_time.c2
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;