diff options
| author | Monty <monty@mariadb.org> | 2020-07-03 00:35:28 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-03 00:35:28 +0300 |
| commit | 5211af1c16063e9c7a62e39ae4acfdc7c9f15e35 (patch) | |
| tree | a615a9bf9aaec7dd3f2f510ba2c194d673c65e78 /storage/innobase/trx | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| parent | b6ec1e8bbf0ffca2d715aded694722e0c4b5d484 (diff) | |
| download | mariadb-git-5211af1c16063e9c7a62e39ae4acfdc7c9f15e35.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 4814c5517a7..c93ec9c1112 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -457,15 +457,11 @@ void trx_free(trx_t*& trx) #ifdef __SANITIZE_ADDRESS__ /* Unpoison the memory for innodb_monitor_set_option; it is operating also on the freed transaction objects. */ - MEM_UNDEFINED(&trx->mutex, sizeof trx->mutex); + MEM_MAKE_ADDRESSABLE(&trx->mutex, sizeof trx->mutex); /* For innobase_kill_connection() */ -# ifdef WITH_WSREP - MEM_UNDEFINED(&trx->wsrep, sizeof trx->wsrep); -# endif - MEM_UNDEFINED(&trx->state, sizeof trx->state); - MEM_UNDEFINED(&trx->mysql_thd, sizeof trx->mysql_thd); + MEM_MAKE_ADDRESSABLE(&trx->state, sizeof trx->state); + MEM_MAKE_ADDRESSABLE(&trx->mysql_thd, sizeof trx->mysql_thd); #endif -#ifdef HAVE_valgrind_or_MSAN /* Unpoison the memory for innodb_monitor_set_option; it is operating also on the freed transaction objects. We checked that these were initialized in @@ -477,7 +473,6 @@ void trx_free(trx_t*& trx) # endif MEM_MAKE_DEFINED(&trx->state, sizeof trx->state); MEM_MAKE_DEFINED(&trx->mysql_thd, sizeof trx->mysql_thd); -#endif trx = NULL; } |