diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
| commit | ca38b6e42791a6edbd3cc0b626a8d06b7776e76b (patch) | |
| tree | f0b9f34521554ce94ef9a5bd6c7e5f595459240f /sql/sql_partition.cc | |
| parent | ea7830eef48333e28f98a9b91f05a95735b465a3 (diff) | |
| parent | 7476e8c7cdd73d60294126a2840baee97e7644b6 (diff) | |
| download | mariadb-git-ca38b6e42791a6edbd3cc0b626a8d06b7776e76b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 2df69a393a3..9a08973562c 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -5033,7 +5033,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, { *fast_alter_table= true; /* Force table re-open for consistency with the main case. */ - table->m_needs_reopen= true; + table->mark_table_for_reopen(); } else { @@ -5081,7 +5081,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info, must be reopened. */ *fast_alter_table= true; - table->m_needs_reopen= true; + table->mark_table_for_reopen(); } else { @@ -6930,7 +6930,7 @@ void handle_alter_part_error(ALTER_PARTITION_PARAM_TYPE *lpt, THD *thd= lpt->thd; TABLE *table= lpt->table; DBUG_ENTER("handle_alter_part_error"); - DBUG_ASSERT(table->m_needs_reopen); + DBUG_ASSERT(table->needs_reopen()); if (close_table) { @@ -7151,7 +7151,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, bool frm_install= FALSE; MDL_ticket *mdl_ticket= table->mdl_ticket; DBUG_ENTER("fast_alter_partition_table"); - DBUG_ASSERT(table->m_needs_reopen); + DBUG_ASSERT(table->needs_reopen()); part_info= table->part_info; lpt->thd= thd; |