Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: I5c4e86111159a5143f23a0f6d36cd28c43d6fe57

Author: RahulSisondia

mysql-test/r/select_count.result

@@ -52,10 +52,10 @@ Handler_discover	0
 Handler_external_lock	2
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -100,10 +100,10 @@ Handler_discover	0
 Handler_external_lock	4
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -148,10 +148,10 @@ Handler_discover	0
 Handler_external_lock	2
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	1
+Handler_read_first	1
+Handler_read_key	2
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -225,10 +225,10 @@ Handler_discover	0
 Handler_external_lock	2
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -279,10 +279,10 @@ Handler_discover	0
 Handler_external_lock	2
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -404,10 +404,10 @@ Handler_discover	0
 Handler_external_lock	4
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -452,10 +452,10 @@ Handler_discover	0
 Handler_external_lock	4
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0
@@ -487,10 +487,10 @@ Handler_discover	0
 Handler_external_lock	2
 Handler_mrr_init	0
 Handler_prepare	0
-Handler_read_first	0
-Handler_read_key	0
+Handler_read_first	1
+Handler_read_key	1
 Handler_read_last	0
-Handler_read_next	0
+Handler_read_next	3
 Handler_read_prev	0
 Handler_read_rnd	0
 Handler_read_rnd_next	0

storage/innobase/handler/ha_innodb.h

@@ -253,11 +253,6 @@ class ha_innobase : public handler {
 
   int records(ha_rows *num_rows) override;
 
-  int records_from_index(ha_rows *num_rows, uint) override {
-    /* Force use of cluster index until we implement sec index parallel scan. */
-    return ha_innobase::records(num_rows);
-  }
-
   ha_rows records_in_range(uint inx, key_range *min_key,
                            key_range *max_key) override;
 

storage/innobase/handler/ha_innopart.h

@@ -1120,11 +1120,6 @@ class ha_innopart : public ha_innobase,
 
   int records(ha_rows *num_rows) override;
 
-  int records_from_index(ha_rows *num_rows, uint) override {
-    /* Force use of cluster index until we implement sec index parallel scan. */
-    return ha_innopart::records(num_rows);
-  }
-
   int index_next(uchar *record) override {
     return (Partition_helper::ph_index_next(record));
   }