diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 22:59:58 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 22:59:58 +0200 |
| commit | 7841a7eb09208f52fcbab7e80e38c7ca29b1339e (patch) | |
| tree | 7f9c4d80d3b86a33c54ff0090865ada4d4ed577d /sql/field.cc | |
| parent | 77992bc710bbc16798c12da7081769817f87791a (diff) | |
| parent | 1423cf5e3dcb3c50047f086a5933fe77006cf242 (diff) | |
| download | mariadb-git-7841a7eb09208f52fcbab7e80e38c7ca29b1339e.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index cf4bb4ef4f2..b391234b866 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6327,6 +6327,7 @@ bool Field_timef::val_native(Native *to) int Field_year::store(const char *from, size_t len,CHARSET_INFO *cs) { DBUG_ASSERT(marked_for_write_or_computed()); + THD *thd= get_thd(); char *end; int error; longlong nr= cs->cset->strntoull10rnd(cs, from, len, 0, &end, &error); @@ -6338,7 +6339,14 @@ int Field_year::store(const char *from, size_t len,CHARSET_INFO *cs) set_warning(ER_WARN_DATA_OUT_OF_RANGE, 1); return 1; } - if (get_thd()->count_cuted_fields > CHECK_FIELD_EXPRESSION && + + if (thd->count_cuted_fields <= CHECK_FIELD_EXPRESSION && error == MY_ERRNO_EDOM) + { + *ptr= 0; + return 1; + } + + if (thd->count_cuted_fields > CHECK_FIELD_EXPRESSION && (error= check_int(cs, from, len, end, error))) { if (unlikely(error == 1) /* empty or incorrect string */) |