summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-08-28 13:19:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-09-07 22:06:20 +0300
commit9f6a0d291f663e2406943271bfe8282134d61ad5 (patch)
tree7d071d7a9c91b06d1ee63df6c22461752eb1124d /storage
parent68466bb4857974b2cec59a0960700acac960a745 (diff)
downloadmariadb-git-9f6a0d291f663e2406943271bfe8282134d61ad5.tar.gz
row_purge_parse_undo_rec(): Deduplicate some code
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/row/row0purge.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc
index 83f4a313e5f..bfc82ef16ce 100644
--- a/storage/innobase/row/row0purge.cc
+++ b/storage/innobase/row/row0purge.cc
@@ -1000,9 +1000,7 @@ try_again:
ut_ad(!dict_table_is_temporary(node->table));
if (!fil_table_accessible(node->table)) {
- dict_table_close(node->table, FALSE, FALSE);
- node->table = NULL;
- goto err_exit;
+ goto close_exit;
}
if (node->table->n_v_cols && !node->table->vc_templ
@@ -1031,6 +1029,7 @@ try_again:
we do not have an index to call it with. */
close_exit:
dict_table_close(node->table, FALSE, FALSE);
+ node->table = NULL;
err_exit:
rw_lock_s_unlock(dict_operation_lock);
return(false);