summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-05-26 11:54:55 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-05-26 11:54:55 +0300
commitca38b6e42791a6edbd3cc0b626a8d06b7776e76b (patch)
treef0b9f34521554ce94ef9a5bd6c7e5f595459240f /sql/sql_admin.cc
parentea7830eef48333e28f98a9b91f05a95735b465a3 (diff)
parent7476e8c7cdd73d60294126a2840baee97e7644b6 (diff)
downloadmariadb-git-ca38b6e42791a6edbd3cc0b626a8d06b7776e76b.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index 9f28f6524d9..d62c18c6769 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -1090,7 +1090,7 @@ send_result_message:
}
/* Make sure this table instance is not reused after the operation. */
if (table->table)
- table->table->m_needs_reopen= true;
+ table->table->mark_table_for_reopen();
}
result_code= result_code ? HA_ADMIN_FAILED : HA_ADMIN_OK;
table->next_local= save_next_local;
@@ -1215,7 +1215,7 @@ err:
trans_rollback(thd);
if (table && table->table)
{
- table->table->m_needs_reopen= true;
+ table->table->mark_table_for_reopen();
table->table= 0;
}
close_thread_tables(thd); // Shouldn't be needed