diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-18 20:05:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-18 20:05:50 +0200 |
| commit | 09c5bbf471da46d33cb21bf67166078bbf7e8f8c (patch) | |
| tree | 4706a7158538d477bf1dd9e3a41cdd7374605f16 /sql/field.cc | |
| parent | 682c3bfd259b3184232e5329558094faa0bc8562 (diff) | |
| parent | 40088bfc7e100294d622ab32a6e7cbcb79c12eab (diff) | |
| download | mariadb-git-09c5bbf471da46d33cb21bf67166078bbf7e8f8c.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1ffe2ce78ac..36f9fd5ee36 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4729,7 +4729,7 @@ double Field_double::val_real(void) return j; } -longlong Field_double::val_int(void) +longlong Field_double::val_int_from_real(bool want_unsigned_result) { ASSERT_COLUMN_MARKED_FOR_READ; double j; @@ -4737,7 +4737,7 @@ longlong Field_double::val_int(void) bool error; float8get(j,ptr); - res= double_to_longlong(j, 0, &error); + res= double_to_longlong(j, want_unsigned_result, &error); if (error) { THD *thd= get_thd(); |