diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-01-12 17:18:53 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-01-12 17:18:53 +0100 |
| commit | 3b23a99b8759349a07ed065f4044c3fa4b05e328 (patch) | |
| tree | 5e6cef68923dc60f96971d7e8071520cede81949 /sql | |
| parent | 16f374ef65270940e181d9136b5886510365c8d1 (diff) | |
| download | mariadb-git-3b23a99b8759349a07ed065f4044c3fa4b05e328.tar.gz | |
Backport of a 5.0.74 fix into 5.0.72sp1:
BUG#38842 - Fix for 25951 seems incorrect
Original changeset:
> revision-id: svoj@mysql.com-20081111091051-54pr96nf1z2s30gx
> parent: vvaintroub@mysql.com-20081110201804-bi98gcs9avsf58ff
> committer: Sergey Vojtovich <svoj@mysql.com>
> branch nick: mysql-5.0-bugteam-bug38842
> timestamp: Tue 2008-11-11 13:10:51 +0400
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index e663e1fcf83..66fbf1eb4d2 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5022,7 +5022,9 @@ bool Item_func_match::fix_index() for (keynr=0 ; keynr < table->s->keys ; keynr++) { if ((table->key_info[keynr].flags & HA_FULLTEXT) && - (table->s->keys_in_use.is_set(keynr))) + (flags & FT_BOOL ? 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; |