1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove a redundant condition added by the 5.6.40 merge

Browse Source 
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().
This commit is contained in:
Marko Mäkelä 2018-05-11 13:48:57 +03:00
parent 3cbfe8cc47
commit 580a8061a7
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/innobase/row/row0import.cc
View File

@ -1820,10 +1820,6 @@ PageConverter::update_records(
m_rec_iter.open(block);
if (!page_is_leaf(block->frame)) {
return DB_SUCCESS;
}
while (!m_rec_iter.end()) {
rec_t* rec = m_rec_iter.current();
@ -1928,11 +1924,7 @@ PageConverter::update_index_page(
return(DB_SUCCESS);
}
if (!page_is_leaf(block->frame)) {
return (DB_SUCCESS);
}
return(update_records(block));
return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS;
}
/**

6
storage/xtradb/row/row0import.cc
View File

@ -1820,10 +1820,6 @@ PageConverter::update_records(
m_rec_iter.open(block);
if (!page_is_leaf(block->frame)) {
return DB_SUCCESS;
}
while (!m_rec_iter.end()) {
rec_t* rec = m_rec_iter.current();
ibool deleted = rec_get_deleted_flag(rec, comp);
@ -1927,7 +1923,7 @@ PageConverter::update_index_page(
return(DB_SUCCESS);
}
return(update_records(block));
return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS;
}
/**