Skip to content

M
MariaDB
Commit 0fa5ad3a authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.2 into 10.3

parents 40ab433e 863a9517
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
storage/innobase/btr/btr0cur.cc
View file @ 0fa5ad3a
...@@ -2881,7 +2881,7 @@ btr_cur_open_at_rnd_pos_func( ...@@ -2881,7 +2881,7 @@ btr_cur_open_at_rnd_pos_func(
index->table->file_unreadable = true; index->table->file_unreadable = true;
} }
goto exit_loop; break;
} }
page = buf_block_get_frame(block); page = buf_block_get_frame(block);
...@@ -3038,12 +3038,11 @@ btr_cur_open_at_rnd_pos_func( ...@@ -3038,12 +3038,11 @@ btr_cur_open_at_rnd_pos_func(
n_blocks++; n_blocks++;
} }
exit_loop:
if (UNIV_LIKELY_NULL(heap)) { if (UNIV_LIKELY_NULL(heap)) {
mem_heap_free(heap); mem_heap_free(heap);
} }
return(true); return err == DB_SUCCESS;
} }
/*==================== B-TREE INSERT =========================*/ /*==================== B-TREE INSERT =========================*/
......
storage/innobase/trx/trx0rec.cc
View file @ 0fa5ad3a
...@@ -1905,7 +1905,7 @@ dberr_t trx_undo_report_rename(trx_t* trx, const dict_table_t* table) ...@@ -1905,7 +1905,7 @@ dberr_t trx_undo_report_rename(trx_t* trx, const dict_table_t* table)
ut_ad(err == DB_SUCCESS); ut_ad(err == DB_SUCCESS);
ut_ad(undo); ut_ad(undo);
for (ut_d(int loop_count = 0);;) { for (ut_d(int loop_count = 0);;) {
ut_ad(++loop_count < 2); ut_ad(loop_count++ < 2);
ut_ad(undo->last_page_no == block->page.id.page_no()); ut_ad(undo->last_page_no == block->page.id.page_no());
if (ulint offset = trx_undo_page_report_rename( if (ulint offset = trx_undo_page_report_rename(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7