diff --git a/sql/handler.cc b/sql/handler.cc index cf48e954f8f..f6972876732 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6415,6 +6415,7 @@ ha_rows handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, rows = 1; /* there can be at most one row */ else if (range.range_flag & SKIP_RECORDS_IN_RANGE) { // 2) if ((range.range_flag & EQ_RANGE) && + !(range.range_flag & NULL_RANGE) && (keyparts_used = std::popcount(range.start_key.keypart_map))) { rows = static_cast( table->key_info[keyno].records_per_key(keyparts_used - 1));