Merge 10.3 into 10.4

1 files changed, 10 insertions, 9 deletions

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 231dcecf6f5..f01191d3c7e 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -2841,14 +2841,17 @@ bool create_key_parts_for_pseudo_indexes(RANGE_OPT_PARAM *param,
 {
   Field **field_ptr;
   TABLE *table= param->table;
+  partition_info *part_info= NULL;
+  #ifdef WITH_PARTITION_STORAGE_ENGINE
+    part_info= table->part_info;
+  #endif
   uint parts= 0;
 
   for (field_ptr= table->field; *field_ptr; field_ptr++)
   {
-    Column_statistics* col_stats= (*field_ptr)->read_stats;
-    if (bitmap_is_set(used_fields, (*field_ptr)->field_index)
-       && col_stats && !col_stats->no_stat_values_provided()
-       && !((*field_ptr)->type() == MYSQL_TYPE_GEOMETRY))
+    Field *field= *field_ptr;
+    if (bitmap_is_set(used_fields, field->field_index) &&
+        is_eits_usable(field))
       parts++;
   }
 
@@ -2866,12 +2869,10 @@ bool create_key_parts_for_pseudo_indexes(RANGE_OPT_PARAM *param,
   uint max_key_len= 0;
   for (field_ptr= table->field; *field_ptr; field_ptr++)
   {
-    if (bitmap_is_set(used_fields, (*field_ptr)->field_index))
+    Field *field= *field_ptr;
+    if (bitmap_is_set(used_fields, field->field_index))
     {
-      Field *field= *field_ptr;
-      Column_statistics* col_stats= field->read_stats;
-      if (field->type() == MYSQL_TYPE_GEOMETRY ||
-           !col_stats || col_stats->no_stat_values_provided())
+      if (!is_eits_usable(field))
         continue;
 
       uint16 store_length;