At file:///home/psergey/dev2/maria-5.3-dsmrr-cpk-r3/ ------------------------------------------------------------ revno: 2809 revision-id: psergey@askmonty.org-20100808083048-xxke7b0rdjq0kw71 parent: psergey@askmonty.org-20100808071354-v1d4objmg07ii10i committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-dsmrr-cpk-r3 timestamp: Sun 2010-08-08 12:30:48 +0400 message: Fix valgrind failure: don't access key_buffer if we haven't set it up yet. === modified file 'sql/multi_range_read.cc' --- a/sql/multi_range_read.cc 2010-08-08 07:13:54 +0000 +++ b/sql/multi_range_read.cc 2010-08-08 08:30:48 +0000 @@ -822,7 +822,8 @@ // reset the buffer for writing. key_buffer.reset_for_writing(); - while ((key_buffer.have_space_for(key_buff_elem_size)) && + while ((key_tuple_length == 0 || + key_buffer.have_space_for(key_buff_elem_size)) && !(res= h->mrr_funcs.next(h->mrr_iter, &cur_range))) { DBUG_ASSERT(cur_range.range_flag & EQ_RANGE);