database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-21 13:41:04 +03:00
parent 1388845e04 1a2308d3f4
commit e4a7c15dd6
70 changed files with 1947 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_handler.cc
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;