diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:07:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-07 15:07:09 +0200 |
| commit | 6fb963be9dc000ef4ee3e002a01e25beb1d01e3a (patch) | |
| tree | 34afe6f3ea9173a0ef494d4a92246ce55b4f46a2 /sql/opt_range.cc | |
| parent | a00f8bc3ad3b04b543e2af400289f283fee5427c (diff) | |
| parent | 06401b6818d4f67d3e416785749dcbb8ea3230fb (diff) | |
| download | mariadb-git-10.4-broken-merge.tar.gz | |
WIP broken merge of 10.3 into 10.410.4-broken-merge
Some conflicts in sql/sql_acl.cc were incorrectly resolved,
causing various test failures. Here are some examples:
main.invisible_field_grant_system
main.invisible_field_grant_completely
main.read_only
main.sp-security
main.view_grant
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index d6db365a8a2..231dcecf6f5 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2869,7 +2869,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; |