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/multi_range_read.cc | |
| parent | 08ce9bfe057b6cd31e7fbca4e4e9e48edde242fb (diff) | |
| parent | ee2b7db3f88f6882022a8aa71b30043ed8b40792 (diff) | |
| download | mariadb-git-a0fd7382bc1e4a8ba0affd27d3034f445a4bb453.tar.gz | |
Merge 10.0-base -> 10.0
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index b6133eac3ae..3ea65b16e3d 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -1199,9 +1199,9 @@ bool DsMrr_impl::setup_buffer_sharing(uint key_size_in_keybuf, statistics? */ uint parts= my_count_bits(key_tuple_map); - ulong rpc; + ha_rows rpc; ulonglong rowids_size= rowid_buf_elem_size; - if ((rpc= key_info->actual_rec_per_key(parts - 1))) + if ((rpc= (ha_rows) key_info->actual_rec_per_key(parts - 1))) rowids_size= rowid_buf_elem_size * rpc; double fraction_for_rowids= |