summaryrefslogtreecommitdiff
path: root/storage/innobase/trx
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-06-28 20:07:32 +0300
committerMonty <monty@mariadb.org>2020-07-02 17:57:34 +0300
commit65f831d17c84900c1faea49164688e2f5ce59563 (patch)
treec7c576c77fbee59de6b2a1c7d8ac5041e0e06f8d /storage/innobase/trx
parent29f9e679adc90adf5d3c6e08da947789c9c2ac8b (diff)
downloadmariadb-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/trx')
-rw-r--r--storage/innobase/trx/trx0trx.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 2e761cd7a16..c9b559c7307 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -458,7 +458,7 @@ void trx_free(trx_t*& trx)
MEM_UNDEFINED(&trx->state, sizeof trx->state);
MEM_UNDEFINED(&trx->mysql_thd, sizeof trx->mysql_thd);
#endif
-#ifdef HAVE_valgrind_or_MSAN
+#ifdef HAVE_valgrind
/* Unpoison the memory for innodb_monitor_set_option;
it is operating also on the freed transaction objects.
We checked that these were initialized in