diff options
| author | petr/cps@mysql.com/owlet.local <> | 2006-11-01 17:35:35 +0300 |
|---|---|---|
| committer | petr/cps@mysql.com/owlet.local <> | 2006-11-01 17:35:35 +0300 |
| commit | 7974bf90aab8337cb6b68955a3e5db68bcd3e081 (patch) | |
| tree | 943fb5e51a9978101520019d70d4771a9085dfab /sql/time.cc | |
| parent | 643606cac9ee6e7ca3deefaf2a98af85223eff29 (diff) | |
| parent | 3ec542dfbdd08c13a6c33b07f7ddd9650c0e0ad8 (diff) | |
| download | mariadb-git-7974bf90aab8337cb6b68955a3e5db68bcd3e081.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191
into mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
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 5069031081d..448a70d6f09 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -229,14 +229,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. */ |