summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authormonty@tramp.mysql.fi <>2000-09-26 00:33:25 +0300
committermonty@tramp.mysql.fi <>2000-09-26 00:33:25 +0300
commite32799e4ddeb03362d5740ac4f3ce5a9e4627ea0 (patch)
tree047c90e932cb7b90a58fe795b855351027725c29 /sql/table.cc
parent50486eeb807aefb8af2e03636544fd167ded7f00 (diff)
downloadmariadb-git-e32799e4ddeb03362d5740ac4f3ce5a9e4627ea0.tar.gz
RIGHT JOIN, part of automatic repair of MyISAM tables, backup on repair,
reading from FIFO, fixes for FULLTEXT, @@IDENTITY
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc5
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) &&