Merge 10.0 into 10.1

MariaDB · Dec 13, 2017 · 7be5b6f · 7be5b6f
2 parents e9cc486 + 9d76b27
commit 7be5b6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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;
 	}
 

diff --git 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;
 	}