diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 22:10:50 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-06-14 22:10:50 +0200 |
| commit | f66d1850ac30922eaa49c0131d89efc8357155ff (patch) | |
| tree | cb69c43694146bb7993078e76e203ded4ca48a5e /storage/innobase/row/row0row.cc | |
| parent | 772c5f3c78fcdaea2169ba435bac8d851c7945c7 (diff) | |
| parent | 1135244a647e423f6a7b2122ad9c305253039399 (diff) | |
| download | mariadb-git-f66d1850ac30922eaa49c0131d89efc8357155ff.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'storage/innobase/row/row0row.cc')
| -rw-r--r-- | storage/innobase/row/row0row.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index 40f0a71a122..57e2c8e4fdb 100644 --- a/storage/innobase/row/row0row.cc +++ b/storage/innobase/row/row0row.cc @@ -1206,9 +1206,12 @@ row_search_on_row_ref( if (UNIV_UNLIKELY(ref->info_bits != 0)) { ut_ad(ref->is_metadata()); ut_ad(ref->n_fields <= index->n_uniq); - btr_pcur_open_at_index_side(true, index, mode, pcur, true, 0, - mtr); - btr_pcur_move_to_next_user_rec(pcur, mtr); + if (btr_pcur_open_at_index_side( + true, index, mode, pcur, true, 0, mtr) + != DB_SUCCESS + || !btr_pcur_move_to_next_user_rec(pcur, mtr)) { + return FALSE; + } /* We do not necessarily have index->is_instant() here, because we could be executing a rollback of an instant ADD COLUMN operation. The function @@ -1219,7 +1222,10 @@ row_search_on_row_ref( & REC_INFO_MIN_REC_FLAG; } else { ut_a(ref->n_fields == index->n_uniq); - btr_pcur_open(index, ref, PAGE_CUR_LE, mode, pcur, mtr); + if (btr_pcur_open(index, ref, PAGE_CUR_LE, mode, pcur, mtr) + != DB_SUCCESS) { + return FALSE; + } } low_match = btr_pcur_get_low_match(pcur); |