diff options
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 2151b6d41cc..f40c8d0fbd8 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -13,6 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ +#include "mariadb.h" #include "sql_parse.h" #include <my_bit.h> #include "sql_select.h" @@ -769,12 +770,6 @@ int Mrr_ordered_rndpos_reader::get_next(range_id_t *range_info) res= file->ha_rnd_pos(file->get_table()->record[0], rowid_buffer->read_ptr1); - if (res == HA_ERR_RECORD_DELETED) - { - /* not likely to get this code with current storage engines, but still */ - continue; - } - if (res) return res; /* Some fatal error */ @@ -1668,10 +1663,10 @@ int DsMrr_impl::dsmrr_explain_info(uint mrr_mode, char *str, size_t size) else if (mrr_mode & DSMRR_IMPL_SORT_ROWIDS) used_str= rowid_ordered; - uint used_str_len= strlen(used_str); - uint copy_len= MY_MIN(used_str_len, size); + size_t used_str_len= strlen(used_str); + size_t copy_len= MY_MIN(used_str_len, size); memcpy(str, used_str, copy_len); - return copy_len; + return (int)copy_len; } return 0; } @@ -1730,7 +1725,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags, else { cost->reset(); - *buffer_size= MY_MAX(*buffer_size, + *buffer_size= (uint)MY_MAX(*buffer_size, (size_t)(1.2*rows_in_last_step) * elem_size + primary_file->ref_length + table->key_info[keynr].key_length); } |