diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-14 12:06:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-14 13:36:11 +0300 |
| commit | fc58c1721631fcc6c9414482b3b7e90cd8e7325d (patch) | |
| tree | bc48d97453e23bf2b2b11415cbef906dc67cb137 /storage/innobase/srv | |
| parent | a12aed0398a33e113befc25e49967c340f96025f (diff) | |
| download | mariadb-git-fc58c1721631fcc6c9414482b3b7e90cd8e7325d.tar.gz | |
MDEV-21336 Memory leaks related to innodb_debug_sync
This essentially reverts commit b393e2cb0c079b30563dcc87a62002c9c778643c.
The leak might have been fixed, but because the
DEBUG_SYNC instrumentation for InnoDB purge threads was reverted
in 10.5 commit 5e62b6a5e06eb02cbde1e34e95e26f42d87fce02
as part of introducing a thread pool, it is easiest to revert
the entire change.
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 44c07693e6a..6eb67a1b2d4 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -2600,13 +2600,6 @@ DECLARE_THREAD(srv_worker_thread)( slot = srv_reserve_slot(SRV_WORKER); -#ifdef UNIV_DEBUG - UT_LIST_INIT(slot->debug_sync, - &srv_slot_t::debug_sync_t::debug_sync_list); - rw_lock_create(PFS_NOT_INSTRUMENTED, &slot->debug_sync_lock, - SYNC_NO_ORDER_CHECK); -#endif - ut_a(srv_n_purge_threads > 1); ut_a(ulong(my_atomic_loadlint(&srv_sys.n_threads_active[SRV_WORKER])) < srv_n_purge_threads); @@ -2854,12 +2847,6 @@ DECLARE_THREAD(srv_purge_coordinator_thread)( slot = srv_reserve_slot(SRV_PURGE); -#ifdef UNIV_DEBUG - UT_LIST_INIT(slot->debug_sync, - &srv_slot_t::debug_sync_t::debug_sync_list); - rw_lock_create(PFS_NOT_INSTRUMENTED, &slot->debug_sync_lock, - SYNC_NO_ORDER_CHECK); -#endif ulint rseg_history_len = trx_sys->rseg_history_len; do { |