Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä 2021-10-21 14:57:00 +03:00
commit 489ef007be
76 changed files with 2021 additions and 565 deletions

View file

@ -783,6 +783,9 @@ retry:
if (!(handler= mysql_ha_find_handler(thd, &tables->alias)))
goto err0;
if (thd->transaction.xid_state.check_has_uncommitted_xa())
goto err0;
table= handler->table;
tables->table= table; // This is used by fix_fields
table->pos_in_table_list= tables;