summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-08-15 07:59:39 +0400
committerSergey Petrunya <psergey@askmonty.org>2010-08-15 07:59:39 +0400
commit3b85e019ab30974a41558ba0473c2a85f29e3210 (patch)
treed0c88f174b878a374f9b6bd1fce6cfc1a338d274
parent889e6170fe10a8d9529db2bf409a10c7adbac668 (diff)
downloadmariadb-git-3b85e019ab30974a41558ba0473c2a85f29e3210.tar.gz
Fix another (possibly dangerous) valgrind failure.
-rw-r--r--sql/multi_range_read.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index 4af35dec308..209c13a13cf 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.cc
@@ -454,7 +454,7 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs,
in_index_range= FALSE;
h->mrr_iter= seq_funcs->init(seq_init_param, n_ranges, mode);
h->mrr_funcs= *seq_funcs;
- keyno= h->active_index != MAX_KEY? h->active_index : h2->active_index;
+ keyno= (h->inited == handler::INDEX)? h->active_index : h2->active_index;
dsmrr_fill_key_buffer();
if (dsmrr_eof && !do_rowid_fetch)