diff options
| author | unknown <konstantin@mysql.com> | 2006-02-08 00:02:56 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-08 00:02:56 +0300 |
| commit | a5d0e0c10fbf5aa0b82fd27fd523f5a1c535dd8b (patch) | |
| tree | 509f2f1f78313a455ccb0bd9b3b06b4e8b2e0ada /sql/field.cc | |
| parent | f66cb702f0609ee1b17d8aeacdbb329ae5eb2088 (diff) | |
| parent | d42c472e31dd3cef1a1afb16c380f486e7c771c5 (diff) | |
| download | mariadb-git-a5d0e0c10fbf5aa0b82fd27fd523f5a1c535dd8b.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 3d983bb4d12..72e28cbda9c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5243,7 +5243,7 @@ int Field_date::store(double nr) else tmp= (longlong) rint(nr); - return Field_date::store(tmp); + return Field_date::store(tmp, TRUE); } @@ -5265,6 +5265,9 @@ int Field_date::store(longlong nr, bool unsigned_val) error= 2; } + if (nr >= 19000000000000.0 && nr <= 99991231235959.0) + nr=floor(nr/1000000.0); // Timestamp to date + if (error) set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, error == 2 ? ER_WARN_DATA_OUT_OF_RANGE : |