diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-25 19:41:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-25 19:41:58 +0300 |
| commit | ecc7f305dde85d704a37e584c29df0ed3f97f7be (patch) | |
| tree | 31810998f5f198e105c0f1f8e5acd6c9e7a581c3 /sql/sql_admin.cc | |
| parent | 736ca14323fa16e409378f0da8005bce4be6dcf8 (diff) | |
| parent | 5530a93f47324b847c799d00a2756729a2869d13 (diff) | |
| download | mariadb-git-ecc7f305dde85d704a37e584c29df0ed3f97f7be.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 692ae7b00fa..a094568071b 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 |