diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-11-02 20:38:05 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-11-02 20:38:05 -0700 |
| commit | 8d612adf70c53dcb741b097133e09d176d0780e1 (patch) | |
| tree | 278a83cc5caaccbfb408471cef6bde5e5171d802 /sql/sql_join_cache.cc | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| parent | 32443e744d354fbba93c8761486462b5820b74bb (diff) | |
| download | mariadb-git-8d612adf70c53dcb741b097133e09d176d0780e1.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 8424dd00d93..225bb413195 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -3812,7 +3812,7 @@ 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].real_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; |