diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-30 08:52:05 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-30 08:52:05 +0300 |
commit | a4d753758fd5305853ba339a0cd57d1675d5aa8c (patch) | |
tree | 33afd8af9e7cc164744bb9a2acc8ad5cf819a0e9 /sql/rpl_rli.cc | |
parent | 2885fb0ee496285b49efea7d84c6cd0a8e819319 (diff) | |
parent | 0a573e7e632f604ee58f944161889bf2abe8bc2c (diff) | |
download | mariadb-git-a4d753758fd5305853ba339a0cd57d1675d5aa8c.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'sql/rpl_rli.cc')
-rw-r--r-- | sql/rpl_rli.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 4ba843a51ab..42607fbadcf 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1673,7 +1673,7 @@ end: { table->file->ha_index_or_rnd_end(); ha_commit_trans(thd, FALSE); - ha_commit_trans(thd, TRUE); + trans_commit(thd); } if (table_opened) { |