diff options
| author | monty@mysql.com <> | 2003-12-12 22:26:58 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-12 22:26:58 +0200 |
| commit | f995a5f4aa919d6d229d29fb652a263d8c816430 (patch) | |
| tree | 771f288d33d415cb8e3d292f33e46fdb512d9dff /sql/time.cc | |
| parent | fddab846d4f3658b3488cbec43c7d16f07f14594 (diff) | |
| download | mariadb-git-f995a5f4aa919d6d229d29fb652a263d8c816430.tar.gz | |
Fix autoincrement for signed columns (Bug #1366)
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/time.cc b/sql/time.cc index bf218fa58ab..5dc229b1d88 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -125,6 +125,8 @@ long my_gmt_sec(TIME *t, long *my_timezone) tmp-=t->minute*60 + t->second; // Move to previous hour } *my_timezone= current_timezone; + if (tmp < 0 && t->year <= 1900+YY_PART_YEAR) + tmp= 0; return (long) tmp; } /* my_gmt_sec */ @@ -445,7 +447,7 @@ time_t str_to_timestamp(const char *str,uint length) if (str_to_TIME(str,length,&l_time,0) == TIMESTAMP_NONE) return(0); - if (l_time.year >= TIMESTAMP_MAX_YEAR || l_time.year < 1900+YY_PART_YEAR) + if (l_time.year >= TIMESTAMP_MAX_YEAR || l_time.year < 1900+YY_PART_YEAR-1) { current_thd->cuted_fields++; return(0); |