summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-10-27 14:43:12 +0200
committerGeorgi Kodinov <joro@sun.com>2009-10-27 14:43:12 +0200
commit313c5a01eea6fe4ab528066a7b14fe6b63e2c633 (patch)
tree96eaee1adca9c0b0ccd038e8f119a015e82d0b1f /storage
parent320ba882906a4654577f715d738c6c8504177d35 (diff)
downloadmariadb-git-313c5a01eea6fe4ab528066a7b14fe6b63e2c633.tar.gz
Bug #47930: MATCH IN BOOLEAN MODE returns too many results
inside subquery Re-setting a fulltext index was a no-operation if not all the matches of a search were consumed by reading them. This was preventing a joined table using a fulltext index in a subquery that requires only 1 row of output (e.g. EXISTS) from working correctly because the second execution of the sub-query has the fulltext index cursor in a wrong state and was not finding results. Fixed by making the re-init code _ftb_init_index_search() to re-set open cursors in addition to depleted ones.
Diffstat (limited to 'storage')
-rw-r--r--storage/myisam/ft_boolean_search.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c
index 0a2847be514..492261c5efc 100644
--- a/storage/myisam/ft_boolean_search.c
+++ b/storage/myisam/ft_boolean_search.c
@@ -475,8 +475,7 @@ static void _ftb_init_index_search(FT_INFO *ftb)
int i;
FTB_WORD *ftbw;
- if ((ftb->state != READY && ftb->state !=INDEX_DONE) ||
- ftb->keynr == NO_SUCH_KEY)
+ if (ftb->state == UNINITIALIZED || ftb->keynr == NO_SUCH_KEY)
return;
ftb->state=INDEX_SEARCH;