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_table.cc | |
| parent | 736ca14323fa16e409378f0da8005bce4be6dcf8 (diff) | |
| parent | 5530a93f47324b847c799d00a2756729a2869d13 (diff) | |
| download | mariadb-git-ecc7f305dde85d704a37e584c29df0ed3f97f7be.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index e2a8cafe784..2d9e07b9f3e 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -8044,7 +8044,8 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, if (field->default_value) field->default_value->expr->walk(&Item::rename_fields_processor, 1, &column_rename_param); - table->m_needs_reopen= 1; // because new column name is on thd->mem_root + // Force reopen because new column name is on thd->mem_root + table->mark_table_for_reopen(); } /* Check if field is changed */ @@ -8515,7 +8516,8 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, { check->expr->walk(&Item::rename_fields_processor, 1, &column_rename_param); - table->m_needs_reopen= 1; // because new column name is on thd->mem_root + // Force reopen because new column name is on thd->mem_root + table->mark_table_for_reopen(); } new_constraint_list.push_back(check, thd->mem_root); } |