diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-11-28 23:55:08 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-11-28 23:55:08 +0300 |
| commit | a6d47ab1d3fcd2fcc765fcb69c5df3924a3e9fae (patch) | |
| tree | c236497552625346f887ba952cd5557bde9a8511 /sql/multi_range_read.cc | |
| parent | 8604dc78e2943ec6d486ea2cca934dde535fd748 (diff) | |
| download | mariadb-git-a6d47ab1d3fcd2fcc765fcb69c5df3924a3e9fae.tar.gz | |
Fix buildbot failure: keep rowid_buf_elem_size to its original value, otherwise
subsequent asserts have the wrong meaning.
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index e31c44bd66d..2936bec6a8c 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -1054,14 +1054,15 @@ void DsMrr_impl::setup_buffer_sizes(uint key_size_in_keybuf, */ uint parts= my_count_bits(key_tuple_map); ulong rpc; + ulonglong rowids_size; if ((rpc= key_info->rec_per_key[parts - 1])) { - rowid_buf_elem_size *= rpc; + rowids_size= rowid_buf_elem_size * rpc; } double fraction_for_rowids= - (ulonglong2double(rowid_buf_elem_size) / - (ulonglong2double(rowid_buf_elem_size) + key_buff_elem_size)); + (ulonglong2double(rowids_size) / + (ulonglong2double(rowids_size) + key_buff_elem_size)); size_t bytes_for_rowids= round(fraction_for_rowids * (full_buf_end - full_buf)); |