diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-02-21 22:42:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-22 12:33:08 +0100 |
| commit | bd7f7b14163d0696aa92c90deeab16d63ae6bbd6 (patch) | |
| tree | 4548b3da88d7d5231cc936a5d7f281379f1ad9e6 /sql/sql_show.cc | |
| parent | f6000782fbcd8c0576cb89737ad66902f6113966 (diff) | |
| download | mariadb-git-bd7f7b14163d0696aa92c90deeab16d63ae6bbd6.tar.gz | |
MDEV-371 Unique Index for long columns
post-merge fixes
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 76c2793e8c7..c7b4fc6b2a7 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2352,9 +2352,7 @@ int show_create_table(THD *thd, TABLE_LIST *table_list, String *packet, if (key_part->field && (key_part->length != table->field[key_part->fieldnr-1]->key_length() && - !(key_info->flags & (HA_FULLTEXT | HA_SPATIAL))) && - (key_info->algorithm != HA_KEY_ALG_LONG_HASH || - key_info->algorithm == HA_KEY_ALG_LONG_HASH && key_part->length)) + !(key_info->flags & (HA_FULLTEXT | HA_SPATIAL)))) { packet->append_parenthesized((long) key_part->length / key_part->field->charset()->mbmaxlen); @@ -6644,9 +6642,7 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables, if (!(key_info->flags & HA_FULLTEXT) && (key_part->field && key_part->length != - show_table->s->field[key_part->fieldnr-1]->key_length()) && - (key_info->algorithm != HA_KEY_ALG_LONG_HASH || - key_info->algorithm == HA_KEY_ALG_LONG_HASH && key_part->length)) + show_table->s->field[key_part->fieldnr-1]->key_length())) { table->field[10]->store((longlong) key_part->length / key_part->field->charset()->mbmaxlen, TRUE); |