diff options
author | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-09-29 16:59:36 +0530 |
---|---|---|
committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-09-29 16:59:36 +0530 |
commit | 25ede13611b3c1f736be22fc581a0c371d212f61 (patch) | |
tree | 0a930e742c1f80786b573067bfed9014c8c54ce8 /sql/xa.cc | |
parent | 080522dcd7177a0008824802cd58a36ee8048d8f (diff) | |
parent | 79e32e47a11150839ac4ab44ac02d4019c0e0019 (diff) | |
download | mariadb-git-25ede13611b3c1f736be22fc581a0c371d212f61.tar.gz |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/xa.cc')
-rw-r--r-- | sql/xa.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/xa.cc b/sql/xa.cc index e8e6dc43c56..15833377fb6 100644 --- a/sql/xa.cc +++ b/sql/xa.cc @@ -689,7 +689,7 @@ bool trans_xa_commit(THD *thd) { DEBUG_SYNC(thd, "trans_xa_commit_after_acquire_commit_lock"); - res= MY_TEST(ha_commit_one_phase(thd, 1, 1)); + res= MY_TEST(ha_commit_one_phase(thd, 1)); if (res) my_error(ER_XAER_RMERR, MYF(0)); else |