Skip to content

M
MariaDB
Commit 7be5b6f0 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.0 into 10.1

parents e9cc486c 9d76b274
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
storage/innobase/trx/trx0roll.cc
View file @ 7be5b6f0
...@@ -583,6 +583,8 @@ trx_rollback_active( ...@@ -583,6 +583,8 @@ trx_rollback_active(
ut_ad(!srv_undo_sources); ut_ad(!srv_undo_sources);
ut_ad(srv_fast_shutdown); ut_ad(srv_fast_shutdown);
ut_ad(!dictionary_locked); ut_ad(!dictionary_locked);
que_graph_free(static_cast<que_t*>(
roll_node->undo_thr->common.parent));
goto func_exit; goto func_exit;
} }
......
storage/xtradb/trx/trx0roll.cc
View file @ 7be5b6f0
...@@ -595,6 +595,8 @@ trx_rollback_active( ...@@ -595,6 +595,8 @@ trx_rollback_active(
ut_ad(!srv_undo_sources); ut_ad(!srv_undo_sources);
ut_ad(srv_fast_shutdown); ut_ad(srv_fast_shutdown);
ut_ad(!dictionary_locked); ut_ad(!dictionary_locked);
que_graph_free(static_cast<que_t*>(
roll_node->undo_thr->common.parent));
goto func_exit; goto func_exit;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7