diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-13 23:04:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-13 23:04:30 +0200 |
| commit | 7be5b6f0e6170461e7ccc6ec7947436af2e43e41 (patch) | |
| tree | 7f57cdfd37e5c5efca7ae5dfdc8f5ba8979f4e89 | |
| parent | e9cc486c97d030e27e9c0ad8770b3d8a25afc27d (diff) | |
| parent | 9d76b2749835a4fdbd009433c5a762da2769c4dd (diff) | |
| download | mariadb-git-7be5b6f0e6170461e7ccc6ec7947436af2e43e41.tar.gz | |
Merge 10.0 into 10.1
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/trx/trx0roll.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 1829f6fab9f..2c7287d44cf 100644 --- 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 index 2e463f383ac..9a5fcea71de 100644 --- 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; } |