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 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2017-12-18 20:05:50 +02:00
parent 682c3bfd25 40088bfc7e
commit 09c5bbf471
13 changed files with 153 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.cc
View File

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