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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2022-12-13 11:37:33 +02:00
parent 382e85fe70 8f30973234
commit fdf43b5c78
171 changed files with 1861 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@ -6105,6 +6105,10 @@ int mysql_discard_or_import_tablespace(THD *thd,
if (unlikely(error))
goto err;
if (discard)
tdc_remove_table(thd, TDC_RT_REMOVE_NOT_OWN, table_list->table->s->db.str,
table_list->table->s->table_name.str, true);
/*
The 0 in the call below means 'not in a transaction', which means
immediate invalidation; that is probably what we wish here
@ -8409,6 +8413,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