diff options
Diffstat (limited to 'innobase/row/row0row.c')
| -rw-r--r-- | innobase/row/row0row.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/innobase/row/row0row.c b/innobase/row/row0row.c index a6d3f1d5ab0..9a74397dc08 100644 --- a/innobase/row/row0row.c +++ b/innobase/row/row0row.c @@ -535,7 +535,7 @@ row_build_row_ref_in_tuple( } ut_ad(dtuple_check_typed(ref)); - if (heap) { + if (UNIV_LIKELY_NULL(heap)) { mem_heap_free(heap); } } @@ -616,7 +616,6 @@ row_search_on_row_ref( ulint low_match; rec_t* rec; dict_index_t* index; - page_t* page; ut_ad(dtuple_check_typed(ref)); @@ -629,9 +628,8 @@ row_search_on_row_ref( low_match = btr_pcur_get_low_match(pcur); rec = btr_pcur_get_rec(pcur); - page = buf_frame_align(rec); - if (rec == page_get_infimum_rec(page)) { + if (page_rec_is_infimum(rec)) { return(FALSE); } @@ -702,7 +700,6 @@ row_search_index_entry( { ulint n_fields; ulint low_match; - page_t* page; rec_t* rec; ut_ad(dtuple_check_typed(entry)); @@ -711,11 +708,10 @@ row_search_index_entry( low_match = btr_pcur_get_low_match(pcur); rec = btr_pcur_get_rec(pcur); - page = buf_frame_align(rec); n_fields = dtuple_get_n_fields(entry); - if (rec == page_get_infimum_rec(page)) { + if (page_rec_is_infimum(rec)) { return(FALSE); } |