From 9f6a0d291f663e2406943271bfe8282134d61ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Tue, 28 Aug 2018 13:19:26 +0300
Subject: [PATCH] row_purge_parse_undo_rec(): Deduplicate some code
---
storage/innobase/row/row0purge.cc | 5 ++---
1 file 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 @@ row_purge_parse_undo_rec(
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 @@ row_purge_parse_undo_rec(
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);
--
2.30.9