More cost fixes:bb-10.5-monty-opt

- heap::read_time() and heap::keyread_time() adjusted to not add +1.
  This was to ensure that handler::keyread_time() doesn't give
  higher cost for heap tables than for normal tables. One effect of
  this is that heap and derived tables stored in heap will prefer
  key access as this is now regarded as cheap.
- Changed cost for index read in sql_select.cc to match
  multi_range_read_info_const(). All index cost calculation is now
  done trough one function.
- 'ref' will now use quick_cost for keys if it exists. This is done
  so that for '=' ranges, 'ref' is prefered over 'range'.
- scan_time() now takes avg_io_costs() into account
- get_delayed_table_estimates() uses block_size and avg_io_cost()
- Removed default argument to test_if_order_by_key(); simplifies code

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index d5120d95420..e546f3cfeca 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -4255,7 +4255,7 @@ void select_insert::abort_result_set()
     table will be assigned with view table structure, but that table will
     not be opened really (it is dummy to check fields types & Co).
    */
-  if (table && table->file->get_table())
+  if (table && table->file->is_open())
   {
     bool changed, transactional_table;
     /*