diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 13:41:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-21 13:41:04 +0300 |
| commit | e4a7c15dd6ba812ac9a4183dec937513eb68a2bc (patch) | |
| tree | 41954d8a6608a2309994d3bbe09f72c1cc73ce6f /sql/sql_handler.cc | |
| parent | 1388845e048011932a6d715936a781479c5e6af3 (diff) | |
| parent | 1a2308d3f443d8fcacf5506cb96f802dee3a3519 (diff) | |
| download | mariadb-git-e4a7c15dd6ba812ac9a4183dec937513eb68a2bc.tar.gz | |
Merge 10.2 into 10.3
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 967b85496ac..3475b622130 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -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; |