diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-12-18 11:25:38 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-12-18 11:25:38 +0400 |
| commit | c1e5fef05d87038fff8b55ba763d082a5bec5d78 (patch) | |
| tree | d83530632287de5bd655b67a96621d99d1a1a826 /sql/field.cc | |
| parent | 9d76b2749835a4fdbd009433c5a762da2769c4dd (diff) | |
| download | mariadb-git-c1e5fef05d87038fff8b55ba763d082a5bec5d78.tar.gz | |
MDEV-14008 Assertion failing: `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())
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 7074cc2cbc4..a3c20ec18f2 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4390,7 +4390,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; @@ -4398,7 +4398,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) { ErrConvDouble err(j); |