diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-09 16:11:01 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-09 16:11:01 +0400 |
| commit | d49d4298e9ca332fc345e2af5b19a932bb053215 (patch) | |
| tree | 0c40807e00943fcb4f86ba852c163a782cbd1d7e /sql | |
| parent | 681a2d1a53999f70e5437f62d8478caade48f3b3 (diff) | |
| parent | 121ed547e91b9d1227303233dd5c70a1adf268a0 (diff) | |
| download | mariadb-git-d49d4298e9ca332fc345e2af5b19a932bb053215.tar.gz | |
automerge
Diffstat (limited to 'sql')
| -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 8188b51d4d1..f8ab4b852ec 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3473,7 +3473,7 @@ int Field_longlong::store(double nr) error= 1; } else - res=(longlong) (ulonglong) nr; + res=(longlong) double2ulonglong(nr); } else { |