summaryrefslogtreecommitdiff
path: root/sql/multi_range_read.h
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-09-13 19:45:41 +0400
committerSergey Petrunya <psergey@askmonty.org>2010-09-13 19:45:41 +0400
commit188de43db1db9a88b45b0de5371294ab0f8b2bfe (patch)
treeb5728e7d4db0f2030ae5d71ce1fe04164aa73b56 /sql/multi_range_read.h
parentac3756a1d0412114c1e2cb9bb28c940751c8bf94 (diff)
downloadmariadb-git-188de43db1db9a88b45b0de5371294ab0f8b2bfe.tar.gz
- Fixed BUG#623285: Crash in quick_range_seq_next() in maria-5.3-dsmrr-cpk
- Relax overly-strict assert added in previous commit - Run generic MRR testsuite for Maria engine, too.
Diffstat (limited to 'sql/multi_range_read.h')
-rw-r--r--sql/multi_range_read.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h
index 4b33b85c199..5eaff483c47 100644
--- a/sql/multi_range_read.h
+++ b/sql/multi_range_read.h
@@ -153,7 +153,7 @@ public:
- it is adjacent to buffer space we're using
- it is on the end towards which we grow.
*/
- DBUG_ASSERT(unused_end > unused_start);
+ DBUG_ASSERT(unused_end >= unused_start);
TRASH(unused_start, unused_end - unused_start);
if (direction == 1 && end == unused_start)
{