diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | dfc63866eb91ce5274647dc1176e2f98b5954a50 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /sql/field.cc | |
| parent | 14b769cfc6bcf5e6b3142d12e26667bcec90b2cd (diff) | |
| parent | c33caca3a45cb72ed3354561d4ff9f06dc12466c (diff) | |
| download | mariadb-git-dfc63866eb91ce5274647dc1176e2f98b5954a50.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 75576c59876..3c93ffadac5 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5446,7 +5446,6 @@ int Field_date::store(const char *from, uint len,CHARSET_INFO *cs) int Field_date::store(double nr) { longlong tmp; - int error= 0; if (nr >= 19000000000000.0 && nr <= 99991231235959.0) nr=floor(nr/1000000.0); // Timestamp to date if (nr < 0.0 || nr > 99991231.0) @@ -5455,7 +5454,6 @@ int Field_date::store(double nr) set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, nr, MYSQL_TIMESTAMP_DATE); - error= 1; } else tmp= (longlong) rint(nr); |