diff options
| author | Igor Babaev <igor@askmonty.org> | 2019-02-06 15:56:21 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2019-02-06 15:56:21 -0800 |
| commit | 9e114455a95c15cd1e37dabef0dff1fe2588d50a (patch) | |
| tree | 3852d63e83fa75d27f2a513676745a7a1a2fd82f /sql/multi_range_read.cc | |
| parent | 447e0f023fff0fa2ccfa7e93b77f1da3be3b43f1 (diff) | |
| download | mariadb-git-9e114455a95c15cd1e37dabef0dff1fe2588d50a.tar.gz | |
MDEV-16188 Post merge fixes:fixed warnings on Windows
Also adjusted some result files after Galina's last patch for ANALYZE.
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index cab278f5859..12f72f5de45 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -20,7 +20,7 @@ #include "key.h" #include "sql_statistics.h" -static ulonglong key_block_no(handler *h, uint keyno, uint keyentry_pos) +static ulonglong key_block_no(handler *h, uint keyno, ha_rows keyentry_pos) { return (ulonglong) (h->keyread_time(keyno, 1, keyentry_pos + 1) - h->keyread_time(keyno, 0, keyentry_pos + 1) + 0.5) + 1; @@ -217,7 +217,9 @@ handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, } else { - cost->io_count= read_time(keyno, total_touched_blocks, (uint) total_rows); + cost->io_count= read_time(keyno, + (uint)total_touched_blocks, + (uint) total_rows); cost->cpu_cost= (double) total_rows / TIME_FOR_COMPARE + 0.01; } } |