summaryrefslogtreecommitdiff
path: root/sql/opt_range.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-07 15:39:34 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-07 15:39:34 +0200
commit21069c528e5d44c0f3c4368041c3999460bc53eb (patch)
tree39242ca8957c47daf83460033cb7a73e13b04bfd /sql/opt_range.cc
parentb6f203984bc519a31ac695cbcb6de7f1f638d321 (diff)
parent53440e2dda8b3f2763914708e074c8e4ada9ec74 (diff)
downloadmariadb-git-21069c528e5d44c0f3c4368041c3999460bc53eb.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r--sql/opt_range.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 94cfae2664a..ed7fba2caa9 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -2758,7 +2758,9 @@ bool create_key_parts_for_pseudo_indexes(RANGE_OPT_PARAM *param,
if (bitmap_is_set(used_fields, (*field_ptr)->field_index))
{
Field *field= *field_ptr;
- if (field->type() == MYSQL_TYPE_GEOMETRY)
+ Column_statistics* col_stats= field->read_stats;
+ if (field->type() == MYSQL_TYPE_GEOMETRY ||
+ !col_stats || col_stats->no_stat_values_provided())
continue;
uint16 store_length;