database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-25 19:41:58 +03:00
parent 736ca14323 5530a93f47
commit ecc7f305dd
41 changed files with 985 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@ -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);
}