diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 17:28:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 17:28:22 +0200 |
| commit | 0436a0ff3ccb837a8d3e5ed58628d6a23f16ab6d (patch) | |
| tree | f5971fa4524ce2da166870930f03b970520ad0c2 /sql/field.cc | |
| parent | 0fd3def284b78dff71590686e8f82571fc3808e1 (diff) | |
| parent | 88aff5f471d3d9ae8ecc2f909bcf5bd0ddd6aa7c (diff) | |
| download | mariadb-git-0436a0ff3ccb837a8d3e5ed58628d6a23f16ab6d.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index 5ad1981b752..2a12a80cd70 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4677,6 +4677,15 @@ double Field_double::val_real(void) } +longlong Field_double::val_int_from_real(bool want_unsigned_result) +{ + Converter_double_to_longlong conv(val_real(), want_unsigned_result); + if (!want_unsigned_result && conv.error()) + conv.push_warning(get_thd(), Field_double::val_real(), false); + return conv.result(); +} + + my_decimal *Field_real::val_decimal(my_decimal *decimal_value) { ASSERT_COLUMN_MARKED_FOR_READ; |