summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-11-26 20:23:20 +0100
committerserg@serg.mylan <>2005-11-26 20:23:20 +0100
commit6a83b757642fe630a83466ed514b09d46c5d2a4a (patch)
tree03b7d875d0326d62fd6f1e60656580f126e968de /myisam
parent122b597fc33cef9a974fbf6ed5ffc70e9b1e02dd (diff)
parent701de9be0a45d1d9c4ebfd7af38ce3fc0d09fc2b (diff)
downloadmariadb-git-6a83b757642fe630a83466ed514b09d46c5d2a4a.tar.gz
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'myisam')
-rw-r--r--myisam/ft_parser.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c
index 9198f89ee35..6e79696bd6e 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.c
@@ -149,8 +149,10 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
for (word->pos=doc; doc<end; length++, mbl=my_mbcharlen(cs, *(uchar *)doc), doc+=(mbl ? mbl : 1))
if (true_word_char(cs,*doc))
mwc=0;
- else if (!misc_word_char(*doc) || mwc++)
+ else if (!misc_word_char(*doc) || mwc)
break;
+ else
+ mwc++;
param->prev='A'; /* be sure *prev is true_word_char */
word->len= (uint)(doc-word->pos) - mwc;