diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-01-14 12:55:03 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-01-14 12:55:03 +0300 |
| commit | da5db2e19f775efcda5ea002670ff866e499ae64 (patch) | |
| tree | 9c91826d60d9bd44c38a98b9a04d300e816c8b21 | |
| parent | b266e5b972ec05ce82cccf829abf6c137e090cdd (diff) | |
| download | mariadb-git-da5db2e19f775efcda5ea002670ff866e499ae64.tar.gz | |
Backport of:
3723 oystein.grovlen@sun.com 2009-11-23
Bug#46548 (addendum)
Remove KEY::extra_length. It is not in use.
| -rw-r--r-- | sql/structs.h | 1 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/sql/structs.h b/sql/structs.h index fbbafafe3ea..86d1f12424e 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -75,7 +75,6 @@ typedef struct st_key { uint key_length; /* Tot length of key */ ulong flags; /* dupp key and pack flags */ uint key_parts; /* How many key_parts */ - uint extra_length; uint usable_key_parts; /* Should normally be = key_parts */ uint block_size; uint name_length; diff --git a/sql/table.cc b/sql/table.cc index f8146680450..43b766c7ef2 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1493,7 +1493,6 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, key_part->null_bit= field->null_bit; key_part->store_length+=HA_KEY_NULL_LENGTH; keyinfo->flags|=HA_NULL_PART_KEY; - keyinfo->extra_length+= HA_KEY_NULL_LENGTH; keyinfo->key_length+= HA_KEY_NULL_LENGTH; } if (field->type() == MYSQL_TYPE_BLOB || @@ -1505,7 +1504,6 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, key_part->key_part_flag|= HA_BLOB_PART; else key_part->key_part_flag|= HA_VAR_LENGTH_PART; - keyinfo->extra_length+=HA_KEY_BLOB_LENGTH; key_part->store_length+=HA_KEY_BLOB_LENGTH; keyinfo->key_length+= HA_KEY_BLOB_LENGTH; } |