diff options
| author | unknown <petr/cps@owlet.local> | 2006-11-01 18:18:01 +0300 |
|---|---|---|
| committer | unknown <petr/cps@owlet.local> | 2006-11-01 18:18:01 +0300 |
| commit | 60e315c53d60d1337f71405472189bb353100237 (patch) | |
| tree | 7a5f2fe23939ea4eb1a8b2fdd922f3d3a91fb230 /sql/time.cc | |
| parent | 3ce0cadd05e00b31934af0bbf3b1f18891404a8e (diff) | |
| parent | b2c40c169869f7df93342b434b84af4fb26acbe2 (diff) | |
| download | mariadb-git-60e315c53d60d1337f71405472189bb353100237.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
into mysql.com:/home/cps/mysql/trees/5.1-runtime-bug9191
configure.in:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/timezone2.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/time.cc:
Auto merged
sql/tztime.cc:
Auto merged
include/my_time.h:
manual merge
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/time.cc b/sql/time.cc index 0461f7723c6..3e400046764 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -253,14 +253,11 @@ my_time_t TIME_to_timestamp(THD *thd, const TIME *t, my_bool *in_dst_time_gap) *in_dst_time_gap= 0; - if (t->year < TIMESTAMP_MAX_YEAR && t->year > TIMESTAMP_MIN_YEAR || - t->year == TIMESTAMP_MAX_YEAR && t->month == 1 && t->day == 1 || - t->year == TIMESTAMP_MIN_YEAR && t->month == 12 && t->day == 31) + timestamp= thd->variables.time_zone->TIME_to_gmt_sec(t, in_dst_time_gap); + if (timestamp) { thd->time_zone_used= 1; - timestamp= thd->variables.time_zone->TIME_to_gmt_sec(t, in_dst_time_gap); - if (timestamp >= TIMESTAMP_MIN_VALUE && timestamp <= TIMESTAMP_MAX_VALUE) - return timestamp; + return timestamp; } /* If we are here we have range error. */ |