diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-12-16 21:33:17 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-12-16 21:33:17 -0800 |
| commit | 1b62f0f58c7c5219143b6a87b89b1fa15e2be401 (patch) | |
| tree | 29446273b907c6a46ce222c3c1aec0a4ebf60d32 /sql/sql_join_cache.cc | |
| parent | 7760efad74140680b1eefaf2172b0fa26f7b1146 (diff) | |
| parent | e44253a125c3baf7ea448edce77389810425df2a (diff) | |
| download | mariadb-git-1b62f0f58c7c5219143b6a87b89b1fa15e2be401.tar.gz | |
Merge maria-5.5-mwl248 -> 10.0-base.
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 1f375bf1a03..07266cc9cbe 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -3812,7 +3812,8 @@ uint JOIN_TAB_SCAN_MRR::aux_buffer_incr(ulong recno) uint incr= 0; TABLE_REF *ref= &join_tab->ref; TABLE *tab= join_tab->table; - uint rec_per_key= tab->key_info[ref->key].rec_per_key[ref->key_parts-1]; + uint rec_per_key= + tab->key_info[ref->key].actual_rec_per_key(ref->key_parts-1); set_if_bigger(rec_per_key, 1); if (recno == 1) incr= ref->key_length + tab->file->ref_length; |