diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-11 14:56:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-11 14:56:51 +0200 |
| commit | 4fcfdb60e788c6c8cebe35e2e0f8d9595cc9e930 (patch) | |
| tree | 01fdb93141731c2736575712bf4f442d9c449f1a /storage/innobase/btr/btr0sea.cc | |
| parent | c4ee8a306bf017116616098019bee79fd4d585e9 (diff) | |
| parent | 142442d571dd86c630019ece82e36dc73e1e5f1b (diff) | |
| download | mariadb-git-4fcfdb60e788c6c8cebe35e2e0f8d9595cc9e930.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/btr/btr0sea.cc')
| -rw-r--r-- | storage/innobase/btr/btr0sea.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc index 53f0de4fa63..a19c67ac1fd 100644 --- a/storage/innobase/btr/btr0sea.cc +++ b/storage/innobase/btr/btr0sea.cc @@ -782,10 +782,7 @@ btr_search_check_guess( const rec_t* prev_rec = page_rec_get_prev(rec); if (page_rec_is_infimum(prev_rec)) { - success = *reinterpret_cast<const uint32_t*>( - page_align(prev_rec) + FIL_PAGE_PREV) - == FIL_NULL; - + success = !page_has_prev(page_align(prev_rec)); goto exit_func; } @@ -804,10 +801,7 @@ btr_search_check_guess( const rec_t* next_rec = page_rec_get_next(rec); if (page_rec_is_supremum(next_rec)) { - if (*reinterpret_cast<const uint32_t*>( - page_align(next_rec) + FIL_PAGE_NEXT) - == FIL_NULL) { - + if (!page_has_next(page_align(next_rec))) { cursor->up_match = 0; success = TRUE; } |