diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 20:41:24 +0300 |
| commit | 4d21a145de11eaff28f98fe4ebed56a803450ce0 (patch) | |
| tree | 5c4b00b96e189e3492de198c4080265e81efc832 /sql/sql_handler.cc | |
| parent | 4f59f9078fd9af1e958f4a30788084598053bf50 (diff) | |
| parent | 059a5f11711fd502982abed8781faf9f255fa975 (diff) | |
| download | mariadb-git-bb-10.6-MDEV-26769.tar.gz | |
Merge 10.6bb-10.6-MDEV-26769
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 1a1eead9fdc..833492d3d9f 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -796,6 +796,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; |