diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-26 22:39:45 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-26 22:39:45 +0300 |
| commit | b31f06a74efdfb790e139dae2fc0fb54bc2341b6 (patch) | |
| tree | ea6dbe861611447827a284bc7e8a9fafd9222d6d /sql/table.cc | |
| parent | f0c7c8384123639570f2bc61b7e2c806a386e780 (diff) | |
| download | mariadb-git-b31f06a74efdfb790e139dae2fc0fb54bc2341b6.tar.gz | |
Small fixes for release
Docs/manual.texi:
Update of file limits on windows
myisam/mi_close.c:
Fix for alter table on windows
myisam/mi_extra.c:
Fix for alter table on windows
myisam/myisamlog.c:
Corrected statistics information
sql-bench/limits/mysql-3.23.cfg:
Update to new crash-me
sql-bench/limits/mysql.cfg:
Update to new crash-me
sql/sql_base.cc:
Fix if end of memory
sql/table.cc:
Fix of new introduced index-handling bug
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sql/table.cc b/sql/table.cc index ac70387df5a..66a2ef767b0 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -448,14 +448,13 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, keyinfo->key_length ? UNIQUE_KEY_FLAG : MULTIPLE_KEY_FLAG); if (i == 0) field->key_start|= ((key_map) 1 << key); - 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) && - !(keyinfo->flags & HA_FULLTEXT)) - field->part_of_key|= ((key_map) 1 << key); - } + if ((ha_option & HA_HAVE_KEY_READ_ONLY) && + field->key_length() == key_part->length && + field->type() != FIELD_TYPE_BLOB && + (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) && usable_parts == i) usable_parts++; // For FILESORT |