merge with 5.1

1 files changed, 10 insertions, 1 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 7767a48bae9..13d93e98934 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1443,7 +1443,16 @@ public:
   { return ulonglong2double(stats.data_file_length) / IO_SIZE + 2; }
   virtual double read_time(uint index, uint ranges, ha_rows rows)
   { return rows2double(ranges+rows); }
-  virtual double keyread_read_time(uint index, uint ranges, ha_rows rows);
+
+  /**
+    Calculate cost of 'keyread' scan for given index and number of records.
+
+     @param index    index to read
+     @param ranges   #of ranges to read
+     @param rows     #of records to read
+  */
+  virtual double keyread_time(uint index, uint ranges, ha_rows rows);
+
   virtual const key_map *keys_to_use_for_scanning() { return &key_map_empty; }
   bool has_transactions()
   { return (ha_table_flags() & HA_NO_TRANSACTIONS) == 0; }