diff options
Diffstat (limited to 'storage/heap/ha_heap.cc')
| -rw-r--r-- | storage/heap/ha_heap.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc index 8e63799680b..66d64c54b89 100644 --- a/storage/heap/ha_heap.cc +++ b/storage/heap/ha_heap.cc @@ -221,14 +221,14 @@ void ha_heap::update_key_stats() if (key->algorithm != HA_KEY_ALG_BTREE) { if (key->flags & HA_NOSAME) - key->rec_per_key[key->key_parts-1]= 1; + key->rec_per_key[key->user_defined_key_parts-1]= 1; else { ha_rows hash_buckets= file->s->keydef[i].hash_buckets; uint no_records= hash_buckets ? (uint) (file->s->records/hash_buckets) : 2; if (no_records < 2) no_records= 2; - key->rec_per_key[key->key_parts-1]= no_records; + key->rec_per_key[key->user_defined_key_parts-1]= no_records; } } } @@ -611,7 +611,7 @@ ha_rows ha_heap::records_in_range(uint inx, key_range *min_key, /* Assert that info() did run. We need current statistics here. */ DBUG_ASSERT(key_stat_version == file->s->key_stat_version); - return key->rec_per_key[key->key_parts-1]; + return key->rec_per_key[key->user_defined_key_parts-1]; } @@ -630,7 +630,7 @@ heap_prepare_hp_create_info(TABLE *table_arg, bool internal_table, bzero(hp_create_info, sizeof(*hp_create_info)); for (key= parts= 0; key < keys; key++) - parts+= table_arg->key_info[key].key_parts; + parts+= table_arg->key_info[key].user_defined_key_parts; if (!(keydef= (HP_KEYDEF*) my_malloc(keys * sizeof(HP_KEYDEF) + parts * sizeof(HA_KEYSEG), @@ -641,9 +641,9 @@ heap_prepare_hp_create_info(TABLE *table_arg, bool internal_table, { KEY *pos= table_arg->key_info+key; KEY_PART_INFO *key_part= pos->key_part; - KEY_PART_INFO *key_part_end= key_part + pos->key_parts; + KEY_PART_INFO *key_part_end= key_part + pos->user_defined_key_parts; - keydef[key].keysegs= (uint) pos->key_parts; + keydef[key].keysegs= (uint) pos->user_defined_key_parts; keydef[key].flag= (pos->flags & (HA_NOSAME | HA_NULL_ARE_EQUAL)); keydef[key].seg= seg; |