squash! 55d2ec1

dr-m · dr-m · commit db8b8d2bfb50 · 2025-03-13T09:27:43.000+02:00
trx_purge_attach_undo_recs(), trx_purge(): Clear purge_sys.m_active
only after all table handles have been released.
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
@@ -1293,8 +1293,6 @@ static purge_sys_t::iterator trx_purge_attach_undo_recs(THD *thd,
       break;
   }
 
-  purge_sys.m_active= false;
-
 #ifdef UNIV_DEBUG
   thr= UT_LIST_GET_FIRST(purge_sys.query->thrs);
   for (ulint i= 0; thr && i < *n_work_items;
@@ -1454,6 +1452,7 @@ TRANSACTIONAL_TARGET ulint trx_purge(ulint n_tasks, ulint history_size)
     }
   }
 
+  purge_sys.m_active= false;
   purge_sys.batch_cleanup(head);
 
   MONITOR_INC_VALUE(MONITOR_PURGE_INVOKED, 1);

Original file line number	Diff line number	Diff line change
`@@ -1293,8 +1293,6 @@ static purge_sys_t::iterator trx_purge_attach_undo_recs(THD *thd,`
`1293`	`1293`	`break;`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`		`- purge_sys.m_active= false;`
`1297`		`-`
`1298`	`1296`	`#ifdef UNIV_DEBUG`
`1299`	`1297`	`thr= UT_LIST_GET_FIRST(purge_sys.query->thrs);`
`1300`	`1298`	`for (ulint i= 0; thr && i < *n_work_items;`
`@@ -1454,6 +1452,7 @@ TRANSACTIONAL_TARGET ulint trx_purge(ulint n_tasks, ulint history_size)`
`1454`	`1452`	`}`
`1455`	`1453`	`}`
`1456`	`1454`
	`1455`	`+ purge_sys.m_active= false;`
`1457`	`1456`	`purge_sys.batch_cleanup(head);`
`1458`	`1457`
`1459`	`1458`	`MONITOR_INC_VALUE(MONITOR_PURGE_INVOKED, 1);`