Skip to content

Commit 580a806

Browse files
committed
Remove a redundant condition added by the 5.6.40 merge
When Oracle fixed MDEV-13899 in their own way, they moved the condition to the only caller of PageConverter::update_records(). Thus, the merge of 5.6.40 into MariaDB added a redundant condition. PageConverter::update_records(): Move the page_is_leaf() condition to the only caller, PageConverter::update_index_page().
1 parent 3cbfe8c commit 580a806

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

storage/innobase/row/row0import.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,10 +1820,6 @@ PageConverter::update_records(
18201820

18211821
m_rec_iter.open(block);
18221822

1823-
if (!page_is_leaf(block->frame)) {
1824-
return DB_SUCCESS;
1825-
}
1826-
18271823
while (!m_rec_iter.end()) {
18281824
rec_t* rec = m_rec_iter.current();
18291825

@@ -1928,11 +1924,7 @@ PageConverter::update_index_page(
19281924
return(DB_SUCCESS);
19291925
}
19301926

1931-
if (!page_is_leaf(block->frame)) {
1932-
return (DB_SUCCESS);
1933-
}
1934-
1935-
return(update_records(block));
1927+
return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS;
19361928
}
19371929

19381930
/**

storage/xtradb/row/row0import.cc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,10 +1820,6 @@ PageConverter::update_records(
18201820

18211821
m_rec_iter.open(block);
18221822

1823-
if (!page_is_leaf(block->frame)) {
1824-
return DB_SUCCESS;
1825-
}
1826-
18271823
while (!m_rec_iter.end()) {
18281824
rec_t* rec = m_rec_iter.current();
18291825
ibool deleted = rec_get_deleted_flag(rec, comp);
@@ -1927,7 +1923,7 @@ PageConverter::update_index_page(
19271923
return(DB_SUCCESS);
19281924
}
19291925

1930-
return(update_records(block));
1926+
return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS;
19311927
}
19321928

19331929
/**

0 commit comments

Comments
 (0)