Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 8 deletions

diff --git a/storage/sphinx/ha_sphinx.h b/storage/sphinx/ha_sphinx.h
index 5a1541f1..db41b7bd 100644
--- a/storage/sphinx/ha_sphinx.h
+++ b/storage/sphinx/ha_sphinx.h
@@ -72,14 +72,28 @@ public:
 	uint			max_supported_key_length () const		{ return MAX_KEY_LENGTH; }
 	uint			max_supported_key_part_length () const	{ return MAX_KEY_LENGTH; }
 
-	#if MYSQL_VERSION_ID>50100
-	virtual double	scan_time ()	{ return (double)( stats.records+stats.deleted )/20.0 + 10; }	///< called in test_quick_select to determine if indexes should be used
-	#else
-	virtual double	scan_time ()	{ return (double)( records+deleted )/20.0 + 10; }				///< called in test_quick_select to determine if indexes should be used
-	#endif
-
-        virtual double read_time(uint index, uint ranges, ha_rows rows)
-	{ return ranges + (double)rows/20.0 + 1; }					///< index read time estimate
+	IO_AND_CPU_COST	scan_time ()
+	{
+          IO_AND_CPU_COST cost;
+          cost.io= 0;
+          cost.cpu= (double) (stats.records+stats.deleted) * DISK_READ_COST;
+          return cost;
+        }
+        IO_AND_CPU_COST keyread_time(uint index, ulong ranges, ha_rows rows,
+                                    ulonglong blocks)
+	{
+          IO_AND_CPU_COST cost;
+          cost.io= ranges;
+          cost.cpu= 0;
+          return cost;
+        }
+        IO_AND_CPU_COST rnd_pos_time(ha_rows rows)
+	{
+          IO_AND_CPU_COST cost;
+          cost.io= 0;
+          cost.cpu= 0;
+          return cost;
+        }
 
 public:
 	int				open ( const char * name, int mode, uint test_if_locked );