Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä 2021-03-19 13:06:31 +02:00
commit be881ec457
247 changed files with 5089 additions and 6857 deletions

View file

@ -1184,7 +1184,6 @@ static ulint btr_node_ptr_max_size(const dict_index_t* index)
TABLE_STATS_NAME)
|| !strcmp(index->table->name.m_name,
INDEX_STATS_NAME))) {
ut_ad(!strcmp(field->name, "table_name"));
/* Interpret "table_name" as VARCHAR(199) even
if it was incorrectly defined as VARCHAR(64).
While the caller of ha_innobase enforces the