diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
| commit | 30914389fe9ca13cf29470dd033a5cf6997a3931 (patch) | |
| tree | fac7ab85411e556db4759a9a2c063ef27b851f87 /sql/field.cc | |
| parent | 772e3f61eb2956143bbdb1d85490bd5aad73d43c (diff) | |
| parent | 098c0f2634a35e24e9eb0f06d3fba69d0d097657 (diff) | |
| download | mariadb-git-30914389fe9ca13cf29470dd033a5cf6997a3931.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index d12ff37fba8..b6d1886be6b 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7529,7 +7529,7 @@ my_decimal *Field_string::val_decimal(my_decimal *decimal_value) THD *thd= get_thd(); Converter_str2my_decimal_with_warn(thd, Warn_filter_string(thd, this), - E_DEC_FATAL_ERROR, + E_DEC_FATAL_ERROR & ~E_DEC_BAD_NUM, Field_string::charset(), (const char *) ptr, field_length, decimal_value); @@ -7890,7 +7890,7 @@ my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value) DBUG_ASSERT(marked_for_read()); THD *thd= get_thd(); Converter_str2my_decimal_with_warn(thd, Warn_filter(thd), - E_DEC_FATAL_ERROR, + E_DEC_FATAL_ERROR & ~E_DEC_BAD_NUM, Field_varstring::charset(), (const char *) get_data(), get_length(), decimal_value); @@ -8736,7 +8736,7 @@ my_decimal *Field_blob::val_decimal(my_decimal *decimal_value) THD *thd= get_thd(); Converter_str2my_decimal_with_warn(thd, Warn_filter(thd), - E_DEC_FATAL_ERROR, + E_DEC_FATAL_ERROR & ~E_DEC_BAD_NUM, Field_blob::charset(), blob, length, decimal_value); return decimal_value; |