diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-05-28 15:39:56 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-05-28 15:39:56 +0200 |
| commit | a0fd7382bc1e4a8ba0affd27d3034f445a4bb453 (patch) | |
| tree | c8b4b1dabddbc47829a890d74025f7889e692425 /sql/sql_join_cache.cc | |
| parent | 08ce9bfe057b6cd31e7fbca4e4e9e48edde242fb (diff) | |
| parent | ee2b7db3f88f6882022a8aa71b30043ed8b40792 (diff) | |
| download | mariadb-git-a0fd7382bc1e4a8ba0affd27d3034f445a4bb453.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 6b0882bda80..9fca8730cb5 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -3812,8 +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].actual_rec_per_key(ref->key_parts-1); + ha_rows rec_per_key= + (ha_rows) 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; |