diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 12:58:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 12:58:11 +0200 |
| commit | 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b (patch) | |
| tree | 0aa792118101ee3130b25b47316159aaccec52e2 /sql/field.cc | |
| parent | 87dc4e98dda26ff99a3b3aeae2fce9fd2f2fdf24 (diff) | |
| parent | 1144acbcbdf9b7bdf18c31f88cbe859d99658b53 (diff) | |
| download | mariadb-git-1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b.tar.gz | |
Merge branch '10.0' into 10.1
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 ecb383a9575..a4308a378b3 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4430,7 +4430,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); } |