Merge 10.2 into 10.3

This commit is contained in:
Marko Mäkelä 2021-10-21 13:41:04 +03:00
commit e4a7c15dd6
70 changed files with 1945 additions and 525 deletions

View file

@ -785,6 +785,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;