diff options
| author | ramil/ram@mysql.com/myoffice.izhnet.ru <> | 2006-07-23 14:17:01 +0500 |
|---|---|---|
| committer | ramil/ram@mysql.com/myoffice.izhnet.ru <> | 2006-07-23 14:17:01 +0500 |
| commit | 694d4999ef5a30053aa29f188c1617bf3fcc568c (patch) | |
| tree | b211feabcc6fab041d6cb19a25bab48d948e91b7 /sql/field.cc | |
| parent | 95b88445fbf9cbd20efe25972123029ca679b121 (diff) | |
| parent | 7319ef4ef15726590fe3083233956540196e1345 (diff) | |
| download | mariadb-git-694d4999ef5a30053aa29f188c1617bf3fcc568c.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b16327
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 3cb0c0d3a7c..39d19dc39bc 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3809,7 +3809,7 @@ String *Field_timestamp::val_str(String *val_buffer, String *val_ptr) thd->time_zone_used= 1; temp= time_tmp.year % 100; - if (temp < YY_PART_YEAR) + if (temp < YY_PART_YEAR - 1) { *to++= '2'; *to++= '0'; |