Skip to content

Commit 7be5b6f

Browse files
committed
Merge 10.0 into 10.1
2 parents e9cc486 + 9d76b27 commit 7be5b6f

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

storage/innobase/trx/trx0roll.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ trx_rollback_active(
583583
ut_ad(!srv_undo_sources);
584584
ut_ad(srv_fast_shutdown);
585585
ut_ad(!dictionary_locked);
586+
que_graph_free(static_cast<que_t*>(
587+
roll_node->undo_thr->common.parent));
586588
goto func_exit;
587589
}
588590

storage/xtradb/trx/trx0roll.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,8 @@ trx_rollback_active(
595595
ut_ad(!srv_undo_sources);
596596
ut_ad(srv_fast_shutdown);
597597
ut_ad(!dictionary_locked);
598+
que_graph_free(static_cast<que_t*>(
599+
roll_node->undo_thr->common.parent));
598600
goto func_exit;
599601
}
600602

0 commit comments

Comments
 (0)