diff options
author | unknown <istruewing@stella.local> | 2007-11-02 14:48:36 +0100 |
---|---|---|
committer | unknown <istruewing@stella.local> | 2007-11-02 14:48:36 +0100 |
commit | ac9fea61e85c0d8fe12f0c91e2286eee55ecd9f6 (patch) | |
tree | 3b2357bfc37d35a5d5d4e583e1f692e95c1bf0cd /myisam | |
parent | 6f97c22925f074db15d39b9e8a08d8fd9623af82 (diff) | |
parent | b698b6fd945e5cd0e469e7494518b0a482f61e6e (diff) | |
download | mariadb-git-ac9fea61e85c0d8fe12f0c91e2286eee55ecd9f6.tar.gz |
Merge stella.local:/home2/mydev/mysql-4.1-ateam
into stella.local:/home2/mydev/mysql-4.1-axmrg
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/ft_boolean_search.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index f1ff8f6d886..fad25abcc6c 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -446,7 +446,8 @@ static int _ftb_strstr(const byte *s0, const byte *e0, { if (cs->coll->instr(cs, p0, e0 - p0, s1, e1 - s1, m, 2) != 2) return(0); - if ((!s_after || p0 + m[1].beg == s0 || !true_word_char(cs, p0[m[1].beg-1])) && + if ((!s_after || p0 + m[1].beg == s0 || + !true_word_char(cs, p0[(int) m[1].beg - 1])) && (!e_before || p0 + m[1].end == e0 || !true_word_char(cs, p0[m[1].end]))) return(1); p0+= m[1].beg; |