Merge branch '10.4' into 10.5

1 files changed, 3 insertions, 2 deletions

diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index 3440c8fd205..370906bd1f6 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.h
@@ -65,8 +65,9 @@ public:
   double scan_time()
   { return (double) (stats.records+stats.deleted) / 20.0+10; }
   double read_time(uint index, uint ranges, ha_rows rows)
-  { return (double) rows /  20.0+1; }
-
+  { return (double) rows / 20.0+1; }
+  double keyread_time(uint index, uint ranges, ha_rows rows)
+  { return (double) rows / 20.0+1; }
   int open(const char *name, int mode, uint test_if_locked);
   int close(void);
   void set_keys_for_scanning(void);