diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 22:06:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 22:06:47 +0300 |
| commit | 833637144178dcae60e7bb732dd373679f32d853 (patch) | |
| tree | e46a595a7a554e7064517d2caae5585f62339eac /storage/innobase/trx/trx0purge.cc | |
| parent | 6860d6f8be90994ea2956cecffb235754a5821a2 (diff) | |
| parent | 899c843f11bc40bf4734b61f18bd1d1e5c8d61e5 (diff) | |
| download | mariadb-git-833637144178dcae60e7bb732dd373679f32d853.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/trx/trx0purge.cc')
| -rw-r--r-- | storage/innobase/trx/trx0purge.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index d7efb4c7033..8dd17ce4509 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -1278,7 +1278,12 @@ trx_purge( /*======*/ ulint n_purge_threads, /*!< in: number of purge tasks to submit to the work queue */ - bool truncate) /*!< in: truncate history if true */ + bool truncate /*!< in: truncate history if true */ +#ifdef UNIV_DEBUG + , srv_slot_t *slot /*!< in/out: purge coordinator + thread slot */ +#endif +) { que_thr_t* thr = NULL; ulint n_pages_handled; @@ -1313,6 +1318,7 @@ trx_purge( thr = que_fork_scheduler_round_robin(purge_sys.query, thr); + ut_d(thr->thread_slot = slot); que_run_threads(thr); trx_purge_wait_for_workers_to_complete(); |