mirror of
https://github.com/MariaDB/server.git
synced 2026-04-19 14:55:32 +02:00
Merge 10.0 into 10.1
This commit is contained in:
commit
7be5b6f0e6
2 changed files with 4 additions and 0 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue