diff options
| author | unknown <svoj@june.mysql.com> | 2007-04-18 13:27:04 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-04-18 13:27:04 +0500 |
| commit | 1ff64d6e1111247536ecc004505ca376df8a58b6 (patch) | |
| tree | 527db588a8816c21afde99deb6a4959fae6e0b1a /sql/item_func.cc | |
| parent | 1a90e29f1bfeaaad78e8f29f144d1300c3ae4e5b (diff) | |
| parent | b8250c712653e50acde5485b096429d55290f1ff (diff) | |
| download | mariadb-git-1ff64d6e1111247536ecc004505ca376df8a58b6.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-5.1-engines
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 5c4e83d0e17..eb2dda35ae0 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4725,7 +4725,7 @@ bool Item_func_match::fix_index() for (keynr=0 ; keynr < table->s->keys ; keynr++) { if ((table->key_info[keynr].flags & HA_FULLTEXT) && - (table->keys_in_use_for_query.is_set(keynr))) + (table->s->keys_in_use.is_set(keynr))) { ft_to_key[fts]=keynr; ft_cnt[fts]=0; |