diff options
| author | Alexey Kopytov <alexeyk@mysql.com> | 2008-12-09 13:56:46 +0300 |
|---|---|---|
| committer | Alexey Kopytov <alexeyk@mysql.com> | 2008-12-09 13:56:46 +0300 |
| commit | b722a899138cd4e3c46fb9c71d17b9730d3b9e81 (patch) | |
| tree | e9ecdf125990064c23f415e7b793780a9fb6f532 | |
| parent | 86c976f803c42f540ed783eb748745178077fe4b (diff) | |
| parent | 121ed547e91b9d1227303233dd5c70a1adf268a0 (diff) | |
| download | mariadb-git-b722a899138cd4e3c46fb9c71d17b9730d3b9e81.tar.gz | |
Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.
| -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 e815320bc9e..f4651764b94 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3835,7 +3835,7 @@ int Field_longlong::store(double nr) error= 1; } else - res=(longlong) (ulonglong) nr; + res=(longlong) double2ulonglong(nr); } else { |