diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 14:57:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 14:57:00 +0300 |
| commit | 489ef007bec398c3b7b628325b225c3a015922cf (patch) | |
| tree | 7d1d5b1ea2c55d608f8697377776b9777fa622be /sql/sql_handler.cc | |
| parent | d10c42b42541deed899dd1d1e04b69475339196c (diff) | |
| parent | d5bcccdabbf1a23c75ab4ee0c14149eb6ed27d98 (diff) | |
| download | mariadb-git-489ef007bec398c3b7b628325b225c3a015922cf.tar.gz | |
Merge 10.3 into 10.4
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 8447d5bea7d..073d523b876 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -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; |