diff options
| author | Jacob Mathew <jacob.mathew@mariadb.com> | 2018-03-13 16:15:37 -0700 |
|---|---|---|
| committer | Jacob Mathew <jacob.mathew@mariadb.com> | 2018-03-13 16:15:37 -0700 |
| commit | 1b82bec3c9ade9864dc9483e99d7b527ebff6bf1 (patch) | |
| tree | 0f7cadc18142819248138802f73e4e0e638c8026 /sql/sql_class.cc | |
| parent | 90247658e066c3ae5da1fefb988f5564e24abc90 (diff) | |
| parent | 9d95b8665a3d87ab857e77e220effc64454eb881 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-14019.tar.gz | |
Merge branch '10.2' into bb-10.2-MDEV-14019bb-10.2-MDEV-14019
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1e07849db16..d854d6de110 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1462,6 +1462,7 @@ void THD::cleanup(void) close_temporary_tables(); transaction.xid_state.xa_state= XA_NOTR; + transaction.xid_state.rm_error= 0; trans_rollback(this); xid_cache_delete(this, &transaction.xid_state); |