diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_range.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 548ebfd6531..3adf27539a5 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -10856,9 +10856,11 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min() */ if (min_max_arg_part && min_max_arg_part->field->is_null()) { + uchar key_buf[MAX_KEY_LENGTH]; + /* Find the first subsequent record without NULL in the MIN/MAX field. */ - key_copy(tmp_record, record, index_info, 0); - result= file->index_read_map(record, tmp_record, + key_copy(key_buf, record, index_info, 0); + result= file->index_read_map(record, key_buf, make_keypart_map(real_key_parts), HA_READ_AFTER_KEY); /* @@ -10874,7 +10876,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min() if (!result) { if (key_cmp(index_info->key_part, group_prefix, real_prefix_len)) - key_restore(record, tmp_record, index_info, 0); + key_restore(record, key_buf, index_info, 0); } else if (result == HA_ERR_KEY_NOT_FOUND || result == HA_ERR_END_OF_FILE) result= 0; /* There is a result in any case. */ |