diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-12-20 13:49:27 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-12-20 13:49:27 +0400 |
| commit | cb121a047b55403fe271570c928fd95ed64a1c8f (patch) | |
| tree | 8692a10d5dff66d35014dbb8c91f2deb5173ec64 /sql/field.cc | |
| parent | f7f5c710e478a835196b2fec1f6ae9362eb07cdd (diff) | |
| download | mariadb-git-cb121a047b55403fe271570c928fd95ed64a1c8f.tar.gz | |
An after-fix for MDEV-14008 Assertion failing: `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())
Fixing an additional failure discovered after a merge to 10.2
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index a3c20ec18f2..f4aaaca69d6 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4399,7 +4399,14 @@ longlong Field_double::val_int_from_real(bool want_unsigned_result) float8get(j,ptr); res= double_to_longlong(j, want_unsigned_result, &error); - if (error) + /* + Note, val_uint() is currently used for auto_increment purposes only, + and we want to suppress all warnings in such cases. + If we ever start using val_uint() for other purposes, + val_int_from_real() will need a new separate parameter to + suppress warnings. + */ + if (error && !want_unsigned_result) { ErrConvDouble err(j); push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN, |