diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2013-10-18 23:39:15 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2013-10-18 23:39:15 +0200 |
| commit | 4ff62c01ce6967021f63f55ef6cf617d7118c96b (patch) | |
| tree | 3b2d0f60087472f68589c60ac5f31be39c61f5e1 /storage | |
| parent | f4fd68857b2e7767b559dbc09a8d4abbe7ccec29 (diff) | |
| download | mariadb-git-4ff62c01ce6967021f63f55ef6cf617d7118c96b.tar.gz | |
post-push fix for bug17565888.
Too restrictive assertion, can fail during purge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/btr0pcur.ic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic index 5eb8ed0f32d..f5880e0564a 100644 --- a/storage/innobase/include/btr0pcur.ic +++ b/storage/innobase/include/btr0pcur.ic @@ -164,7 +164,8 @@ btr_pcur_is_after_last_on_page( /*===========================*/ const btr_pcur_t* cursor) /*!< in: persistent cursor */ { - ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED); + ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC + || cursor->pos_state == BTR_PCUR_IS_POSITIONED); ut_ad(cursor->latch_mode != BTR_NO_LATCHES); return(page_cur_is_after_last(btr_pcur_get_page_cur(cursor))); |