diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2007-04-18 12:39:04 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2007-04-18 12:39:04 +0500 |
| commit | b8250c712653e50acde5485b096429d55290f1ff (patch) | |
| tree | 9d6371d95dd1a4c9e1c2d344e76d19eae38341a9 /sql | |
| parent | f4a5f3c6ffd09d574220dd3c20718e239d815341 (diff) | |
| parent | 202f34e2f51cc888cecb6d1be683cf01ba3fbf88 (diff) | |
| download | mariadb-git-b8250c712653e50acde5485b096429d55290f1ff.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-5.0-engines
mysql-test/r/fulltext.result:
Manual merge.
mysql-test/t/fulltext.test:
Manual merge.
sql/item_func.cc:
Manual merge.
Diffstat (limited to 'sql')
| -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 c4279d1bd4e..503b4362e7a 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4734,7 +4734,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; |