diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:05:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:05:29 +0300 |
| commit | 588efca2374536aab956e6366f96082f2886c73c (patch) | |
| tree | af1b126c795cd1255d7c7d72c201c01339119755 /storage/innobase/row/row0merge.cc | |
| parent | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff) | |
| parent | 1feccb505f9ec5cada8f8e2c544f736c1a533633 (diff) | |
| download | mariadb-git-588efca2374536aab956e6366f96082f2886c73c.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 3ef3076abdc..5afb8665d01 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -160,7 +160,7 @@ public: error = btr_cur_search_to_nth_level( m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT, - BTR_MODIFY_LEAF, &ins_cur, 0, &mtr); + BTR_MODIFY_LEAF, &ins_cur, &mtr); /* It need to update MBR in parent entry, so change search mode to BTR_MODIFY_TREE */ @@ -175,7 +175,7 @@ public: error = btr_cur_search_to_nth_level( m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT, - BTR_MODIFY_TREE, &ins_cur, 0, &mtr); + BTR_MODIFY_TREE, &ins_cur, &mtr); } if (error == DB_SUCCESS) { @@ -201,7 +201,7 @@ public: m_index, 0, dtuple, PAGE_CUR_RTREE_INSERT, BTR_MODIFY_TREE, - &ins_cur, 0, &mtr); + &ins_cur, &mtr); if (error == DB_SUCCESS) { error = btr_cur_pessimistic_insert( |