diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 17:55:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 17:55:01 +0300 |
| commit | 6a6bcc53b8767dfbb4dc86bad3e90a276c55f605 (patch) | |
| tree | 04116d0e438cfcf3a3b6a7557d5ec8c570255db6 /sql/field.cc | |
| parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
| parent | ff66d65a096ec02dda1ab449d84a40361551085c (diff) | |
| download | mariadb-git-6a6bcc53b8767dfbb4dc86bad3e90a276c55f605.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index a1c2f1c46c2..a9cf4589a16 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1382,7 +1382,7 @@ void Field::error_generated_column_function_is_not_allowed(THD *thd, QT_ITEM_IDENT_SKIP_TABLE_NAMES)); my_error(ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(error ? 0 : ME_JUST_WARNING), - tmp.c_ptr(), vcol_info->get_vcol_type_name(), + tmp.c_ptr_safe(), vcol_info->get_vcol_type_name(), const_cast<const char*>(field_name.str)); } @@ -7676,6 +7676,15 @@ my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value) } +#ifdef HAVE_valgrind_or_MSAN +void Field_varstring::mark_unused_memory_as_defined() +{ + uint used_length= get_length(); + MEM_MAKE_DEFINED(get_data() + used_length, field_length - used_length); +} +#endif + + int Field_varstring::cmp_max(const uchar *a_ptr, const uchar *b_ptr, uint max_len) { |