database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-12-19 17:28:22 +02:00
parent 0fd3def284 88aff5f471
commit 0436a0ff3c
49 changed files with 866 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/field.cc
View File

@ -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;