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 /storage/innobase/row/row0ftsort.cc | |
| 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 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index c5b6276caf5..dde46b7aae1 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -998,14 +998,14 @@ exit: goto func_exit; } -#ifdef HAVE_valgrind_or_MSAN +#ifdef HAVE_valgrind MEM_UNDEFINED(block[i], srv_sort_buf_size); if (crypt_block[i]) { MEM_UNDEFINED(crypt_block[i], srv_sort_buf_size); } -#endif /* HAVE_valgrind_or_MSAN */ +#endif /* HAVE_valgrind */ } buf[i] = row_merge_buf_empty(buf[i]); |