diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 15:26:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 15:26:25 +0300 |
| commit | 5f8561a6bcdb66e05ca539365cce33a9fc1817a2 (patch) | |
| tree | 3ceb20e3e0e8fc1a0759199ccdf7238f31fd4267 /sql/sql_handler.cc | |
| parent | 3c2ab896b9642c43805a5dfc174c81fc5f902db0 (diff) | |
| parent | 489ef007bec398c3b7b628325b225c3a015922cf (diff) | |
| download | mariadb-git-5f8561a6bcdb66e05ca539365cce33a9fc1817a2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 73bfb8227e1..eab33a79b38 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -784,6 +784,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; |