summaryrefslogtreecommitdiff
path: root/myisam/ft_stopwords.c
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-03-04 16:10:41 +0400
committerunknown <svoj@mysql.com>2005-03-04 16:10:41 +0400
commitd72d7a881c5b034595925bed84244b4304ba3a4f (patch)
treeff61dc5ed94f6b4750e5fe9a68089a8a39c4b069 /myisam/ft_stopwords.c
parentad1c1e070cb446d26ab579769473184e5a09f9df (diff)
downloadmariadb-git-d72d7a881c5b034595925bed84244b4304ba3a4f.tar.gz
Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash
myisam/ft_boolean_search.c: Put phrase words, including stopwords into list `phrase'. Use `phrase' instead of `qout', `qend' in _ftb_strstr. myisam/ft_parser.c: ft_get_word extended, so it can return short words and stopwords. (return value 4) ft_simple_get_word extended, so it can return short words and stopwords when skip_stopwords is false. myisam/ft_stopwords.c: One more argument for ft_simple_get_word. myisam/ftdefs.h: One more argument for ft_simple_get_word added. Third argument of ft_simple_get_word changet to const.
Diffstat (limited to 'myisam/ft_stopwords.c')
-rw-r--r--myisam/ft_stopwords.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_stopwords.c b/myisam/ft_stopwords.c
index a4bce6ad4e8..ab51afb0e82 100644
--- a/myisam/ft_stopwords.c
+++ b/myisam/ft_stopwords.c
@@ -81,7 +81,7 @@ int ft_init_stopwords()
goto err0;
len=my_read(fd, buffer, len, MYF(MY_WME));
end=start+len;
- while (ft_simple_get_word(default_charset_info, &start, end, &w))
+ while (ft_simple_get_word(default_charset_info, &start, end, &w, TRUE))
{
if (ft_add_stopword(my_strdup_with_length(w.pos, w.len, MYF(0))))
goto err1;