Merge 10.0 into 10.1

7be5b6f0 · Marko Mäkelä · e9cc486c · 9d76b274 · 7be5b6f0 · 7be5b6f0
Commit 7be5b6f0 authored Dec 13, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

storage/innobase/trx/trx0roll.cc storage/innobase/trx/trx0roll.cc +2 -0

storage/xtradb/trx/trx0roll.cc storage/xtradb/trx/trx0roll.cc +2 -0

No files found.
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -583,6 +583,8 @@ trx_rollback_active(
 		ut_ad(!srv_undo_sources);
 		ut_ad(srv_fast_shutdown);
 		ut_ad(!dictionary_locked);
+		que_graph_free(static_cast<que_t*>(
+				       roll_node->undo_thr->common.parent));
 		goto func_exit;
 	}


--- a/storage/xtradb/trx/trx0roll.cc
+++ b/storage/xtradb/trx/trx0roll.cc
@@ -595,6 +595,8 @@ trx_rollback_active(
 		ut_ad(!srv_undo_sources);
 		ut_ad(srv_fast_shutdown);
 		ut_ad(!dictionary_locked);
+		que_graph_free(static_cast<que_t*>(
+				       roll_node->undo_thr->common.parent));
 		goto func_exit;
 	}