diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 16:42:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-11 16:42:01 +0300 |
| commit | 0fa5ad3acfadfedba6f89d05745bbd1aee8d8d45 (patch) | |
| tree | e40aaaaec4a83c1751c9a40fe3d30692ed448a89 | |
| parent | 40ab433ecca1ce265e6a9213061bcae4f8014767 (diff) | |
| parent | 863a95173110e1528e7a47fe688fea8784eb67b6 (diff) | |
| download | mariadb-git-0fa5ad3acfadfedba6f89d05745bbd1aee8d8d45.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | storage/innobase/btr/btr0cur.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0rec.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 98463514c09..99a15662e3f 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -2881,7 +2881,7 @@ btr_cur_open_at_rnd_pos_func( index->table->file_unreadable = true; } - goto exit_loop; + break; } page = buf_block_get_frame(block); @@ -3038,12 +3038,11 @@ btr_cur_open_at_rnd_pos_func( n_blocks++; } - exit_loop: if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } - return(true); + return err == DB_SUCCESS; } /*==================== B-TREE INSERT =========================*/ diff --git a/storage/innobase/trx/trx0rec.cc b/storage/innobase/trx/trx0rec.cc index 9888b14190d..44b9f056770 100644 --- a/storage/innobase/trx/trx0rec.cc +++ b/storage/innobase/trx/trx0rec.cc @@ -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(undo); 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()); if (ulint offset = trx_undo_page_report_rename( |