summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2013-10-18 23:49:35 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2013-10-18 23:49:35 +0200
commit6be5ea37d0871b9b66753a496e6dad6eaaebfb8e (patch)
tree267dd9cfe52969ae0035a21f72a895b63c01f679 /storage
parent4ff62c01ce6967021f63f55ef6cf617d7118c96b (diff)
downloadmariadb-git-6be5ea37d0871b9b66753a496e6dad6eaaebfb8e.tar.gz
post-push fix for bug17565888.
Too restrictive assertion, failing during purge
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/include/btr0pcur.ic3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic
index f5880e0564a..db3145132af 100644
--- a/storage/innobase/include/btr0pcur.ic
+++ b/storage/innobase/include/btr0pcur.ic
@@ -91,7 +91,8 @@ btr_pcur_get_block(
/*===============*/
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);
return(btr_cur_get_block(btr_pcur_get_btr_cur(cursor)));
}