summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexey Kopytov <alexeyk@mysql.com>2008-12-09 13:19:46 +0300
committerAlexey Kopytov <alexeyk@mysql.com>2008-12-09 13:19:46 +0300
commit06c4ff1c13f381130c264ba72f13009cc60528f6 (patch)
tree32fcad7ed7f7cee189764df9c58293a9a353273a /sql
parent695a2fd90ea100375ed76d96c0c296ad1f474d01 (diff)
downloadmariadb-git-06c4ff1c13f381130c264ba72f13009cc60528f6.tar.gz
Added a missing bit from the original patch for bug #27483 which was lost when re-applying
the patch manually to another tree.
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc2
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
{