diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 17:55:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 17:55:01 +0300 |
| commit | 6a6bcc53b8767dfbb4dc86bad3e90a276c55f605 (patch) | |
| tree | 04116d0e438cfcf3a3b6a7557d5ec8c570255db6 /storage/innobase/srv | |
| parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
| parent | ff66d65a096ec02dda1ab449d84a40361551085c (diff) | |
| download | mariadb-git-6a6bcc53b8767dfbb4dc86bad3e90a276c55f605.tar.gz | |
Merge 10.2 into 10.3
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 6e7b3e5939f..5a38ce4908e 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -2515,13 +2515,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); @@ -2743,12 +2736,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.history_size(); do { |