diff options
| author | dlenev@mysql.com <> | 2006-02-27 20:00:03 +0300 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2006-02-27 20:00:03 +0300 |
| commit | 6cb5c38c14b02cc2768555b56e857d03f320a3f5 (patch) | |
| tree | a889c7ecad09d0d8e0c342201479d0fecdbbce12 /sql/field.cc | |
| parent | 4ca3409390841cd9fcd56249a2c45d38de20ca14 (diff) | |
| parent | db54dc36f507cd5a4956af58df77aa032849ee84 (diff) | |
| download | mariadb-git-6cb5c38c14b02cc2768555b56e857d03f320a3f5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525
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 35312caf313..eab62cd1958 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5262,7 +5262,7 @@ int Field_date::store(longlong nr, bool unsigned_val) } if (nr >= 19000000000000.0 && nr <= 99991231235959.0) - nr=floor(nr/1000000.0); // Timestamp to date + nr= (longlong) floor(nr/1000000.0); // Timestamp to date if (error) set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, |