diff options
author | unknown <monty@donna.mysql.com> | 2000-09-26 02:59:26 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-26 02:59:26 +0300 |
commit | f0c7c8384123639570f2bc61b7e2c806a386e780 (patch) | |
tree | 0a9d1cee77edbf3d7c1668fa7ffe3970124bed0c /sql/table.cc | |
parent | 2fdf8e6b7e06390036f40e11b3e334cf131d6b7a (diff) | |
parent | 48e80bd5ec3e633b30640e54ae4315915c21559a (diff) | |
download | mariadb-git-f0c7c8384123639570f2bc61b7e2c806a386e780.tar.gz |
merge
BitKeeper/etc/logging_ok:
Auto merged
Docs/manual.texi:
Merge
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 682cd880fe1..ac70387df5a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -451,8 +451,9 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, if (ha_option & HA_HAVE_KEY_READ_ONLY && field->key_length() == key_part->length) { - if (field->key_type() != HA_KEYTYPE_TEXT || - !(ha_option & HA_KEY_READ_WRONG_STR)) + if (field->key_type() != HA_KEYTYPE_TEXT && + !(ha_option & HA_KEY_READ_WRONG_STR) && + !(keyinfo->flags & HA_FULLTEXT)) field->part_of_key|= ((key_map) 1 << key); } if (!(key_part->key_part_flag & HA_REVERSE_SORT) && |