diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-28 19:04:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-28 19:04:23 +0200 |
| commit | 8e7ebfbce89a472b3c5a6c30e6de101e567a8218 (patch) | |
| tree | 9f9950feb45222c7df4f37c841f4af593ec75ee5 /sql/multi_range_read.cc | |
| parent | 3bdede3c67032345ca5f71dd53ca308377dc2398 (diff) | |
| parent | 7c24e8d54d1d41374b7836e3273e7e5eaf22e2c4 (diff) | |
| download | mariadb-git-8e7ebfbce89a472b3c5a6c30e6de101e567a8218.tar.gz | |
5.2 merge
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index efb7ceff05f..53699c47688 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -92,7 +92,7 @@ handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, cost->zero(); cost->avg_io_cost= 1; /* assume random seeks */ if ((*flags & HA_MRR_INDEX_ONLY) && total_rows > 2) - cost->io_count= keyread_read_time(keyno, n_ranges, (uint)total_rows); + cost->io_count= keyread_time(keyno, n_ranges, (uint)total_rows); else cost->io_count= read_time(keyno, n_ranges, total_rows); cost->cpu_cost= (double) total_rows / TIME_FOR_COMPARE + 0.01; @@ -147,7 +147,7 @@ ha_rows handler::multi_range_read_info(uint keyno, uint n_ranges, uint n_rows, /* Produce the same cost as non-MRR code does */ if (*flags & HA_MRR_INDEX_ONLY) - cost->io_count= keyread_read_time(keyno, n_ranges, n_rows); + cost->io_count= keyread_time(keyno, n_ranges, n_rows); else cost->io_count= read_time(keyno, n_ranges, n_rows); return 0; @@ -820,7 +820,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags, cost->mem_cost= (double)rows_in_last_step * elem_size; /* Total cost of all index accesses */ - index_read_cost= h->keyread_read_time(keynr, 1, (double)rows); + index_read_cost= h->keyread_time(keynr, 1, (double)rows); cost->add_io(index_read_cost, 1 /* Random seeks */); return FALSE; } |