diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-10-22 07:19:43 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-10-22 07:19:43 -0700 |
| commit | 2b173bf894b99e7ad5a4e499459141ca08c5027d (patch) | |
| tree | bc02dccdc8cf9bf95f154ab2d30c3bb9756dc5f6 /sql/multi_range_read.cc | |
| parent | fdf789a7eadf864ecc0e617f25f795fafda55026 (diff) | |
| download | mariadb-git-2b173bf894b99e7ad5a4e499459141ca08c5027d.tar.gz | |
Fixed LP bug #878769.
The method DsMrr_impl::dsmrr_init erroneously tried to get a KEY descriptor
for key with number MAX_KEY. This caused valgrind complains.
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 6e11fe5efa0..055a9268417 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -848,7 +848,8 @@ int DsMrr_impl::dsmrr_init(handler *h_arg, RANGE_SEQ_IF *seq_funcs, if (h_idx->primary_key_is_clustered()) { uint pk= h_idx->get_table()->s->primary_key; - saved_pk_length= h_idx->get_table()->key_info[pk].key_length; + if (pk != MAX_KEY) + saved_pk_length= h_idx->get_table()->key_info[pk].key_length; } KEY *used_index= &h_idx->get_table()->key_info[h_idx->active_index]; |