database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2022-12-13 14:39:18 +02:00
parent da5d349935 fdf43b5c78
commit 1dc2f35598
179 changed files with 1890 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -6377,6 +6377,9 @@ int mysql_discard_or_import_tablespace(THD *thd,
if (unlikely(error))
goto err;
if (discard)
table_list->table->s->tdc->flush(thd, true);
/*
The 0 in the call below means 'not in a transaction', which means
immediate invalidation; that is probably what we wish here
@ -8753,6 +8756,8 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
} /* if (def->change.str) */
} /* while (def) */
} /* if (part_field_list || subpart_field_list) */
// Force reopen because new column name is on thd->mem_root
table->mark_table_for_reopen();
} /* if (part_info) */
#endif
// Force reopen because new column name is on thd->mem_root