diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-09-21 08:37:42 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-09-21 08:37:42 +0400 |
| commit | 80bcb05b2451b89dd7e1355c9fde97c115b4bcb3 (patch) | |
| tree | 05ea9ab3270e356039b90b1ab1ec12c5fa143b98 /sql/field.cc | |
| parent | 327b2717219aaa8f9033895a2351a6ccd4655116 (diff) | |
| parent | e07118946a82af60c7cc3804c321d3fd9a49f128 (diff) | |
| download | mariadb-git-80bcb05b2451b89dd7e1355c9fde97c115b4bcb3.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1427e055324..2a3394be411 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4083,7 +4083,8 @@ longlong Field_float::val_int(void) { float j; float4get(j,ptr); - return (longlong) rint(j); + bool error; + return double_to_longlong(j, false, &error); } |