diff options
| author | unknown <jimw@mysql.com> | 2005-06-22 12:46:21 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-22 12:46:21 -0700 |
| commit | d93705b83746b68d730e0c88bd3c21c58312fe6f (patch) | |
| tree | 543baf0f88c15a91f035d35d565cf56621d5f115 /sql | |
| parent | bbc0211304fe7beb47fef9f188e413effeea4470 (diff) | |
| download | mariadb-git-d93705b83746b68d730e0c88bd3c21c58312fe6f.tar.gz | |
Fix reporting of type for unique key on VARCHAR field. (Bug #11227)
mysql-test/r/key.result:
Add new results
mysql-test/t/key.test:
Add new regression test
sql/table.cc:
Use keyinfo->key_parts to determine if key is part of a
multiple-field key or is unique.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/table.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 6677453969b..b8b13aaccd5 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -701,10 +701,9 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, key_part->key_part_flag|= HA_BIT_PART; if (i == 0 && key != primary_key) - field->flags |= - ((keyinfo->flags & HA_NOSAME) && - field->key_length() == - keyinfo->key_length ? UNIQUE_KEY_FLAG : MULTIPLE_KEY_FLAG); + field->flags |= ((keyinfo->flags & HA_NOSAME) && + (keyinfo->key_parts == 1)) ? + UNIQUE_KEY_FLAG : MULTIPLE_KEY_FLAG; if (i == 0) field->key_start.set_bit(key); if (field->key_length() == key_part->length && |