summaryrefslogtreecommitdiff
path: root/storage/innobase/trx
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-10-12 06:34:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-10-12 06:34:09 +0300
commit8e3d85e112964c4f7c2d07710a3c8ee9d5041685 (patch)
tree163e1563442a228221a810093656d4d3844063b2 /storage/innobase/trx
parent0ecc85c5d972590628d76594c805c13a5f9d3a88 (diff)
parent2227dec45e68b57f3d7759c977e16bea1533e810 (diff)
downloadmariadb-git-8e3d85e112964c4f7c2d07710a3c8ee9d5041685.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/trx')
-rw-r--r--storage/innobase/trx/trx0purge.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
index 475babb6195..3ae8db63121 100644
--- a/storage/innobase/trx/trx0purge.cc
+++ b/storage/innobase/trx/trx0purge.cc
@@ -1561,7 +1561,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;
@@ -1597,6 +1602,7 @@ trx_purge(
thr = que_fork_scheduler_round_robin(purge_sys.query, thr);
+ ut_d(thr->thread_slot = slot);
que_run_threads(thr);
my_atomic_addlint(&purge_sys.n_completed, 1);