diff options
| author | Monty <monty@mariadb.org> | 2020-06-28 20:07:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-02 17:57:34 +0300 |
| commit | 65f831d17c84900c1faea49164688e2f5ce59563 (patch) | |
| tree | c7c576c77fbee59de6b2a1c7d8ac5041e0e06f8d /sql/field.h | |
| parent | 29f9e679adc90adf5d3c6e08da947789c9c2ac8b (diff) | |
| download | mariadb-git-65f831d17c84900c1faea49164688e2f5ce59563.tar.gz | |
Fixed bugs found by valgrind
- Some of the bug fixes are backports from 10.5!
- The fix in innobase/fil/fil0fil.cc is just a backport to get less
error messages in mysqld.1.err when running with valgrind.
- Renamed HAVE_valgrind_or_MSAN to HAVE_valgrind
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/field.h b/sql/field.h index 34d6684571b..83cdb903b20 100644 --- a/sql/field.h +++ b/sql/field.h @@ -826,7 +826,7 @@ public: return store(ls.str, (uint) ls.length, cs); } -#ifdef HAVE_valgrind_or_MSAN +#ifdef HAVE_valgrind /** Mark unused memory in the field as defined. Mainly used to ensure that if we write full field to disk (for example in @@ -3466,7 +3466,7 @@ public: bool memcpy_field_possible(const Field *from) const; int store(const char *to,size_t length,CHARSET_INFO *charset); using Field_str::store; -#ifdef HAVE_valgrind_or_MSAN +#ifdef HAVE_valgrind void mark_unused_memory_as_defined(); #endif double val_real(void); @@ -4395,7 +4395,8 @@ public: :Type_handler_hybrid_field_type(&type_handler_null), compression_method_ptr(0), comment(null_clex_str), - on_update(NULL), length(0), invisible(VISIBLE), decimals(0), + on_update(NULL), length(0), invisible(VISIBLE), char_length(0), + decimals(0), flags(0), pack_length(0), key_length(0), unireg_check(Field::NONE), interval(0), charset(&my_charset_bin), srid(0), geom_type(Field::GEOM_GEOMETRY), |