diff options
| author | serg@serg.mylan <> | 2005-03-09 14:09:06 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-03-09 14:09:06 +0100 |
| commit | 956682de1a15d974e6ad034218bb14fa1d17a370 (patch) | |
| tree | 4625d7f51e27bb495a5f571cfcad95a20d34e4a9 /myisam/ft_parser.c | |
| parent | c49928447df13564ad8c657bf01d8010c9732d0c (diff) | |
| parent | c64b47fc0e4e834b0d7a449f6f948893e790e902 (diff) | |
| download | mariadb-git-956682de1a15d974e6ad034218bb14fa1d17a370.tar.gz | |
merged
Diffstat (limited to 'myisam/ft_parser.c')
| -rw-r--r-- | myisam/ft_parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 3184cc6644c..2fad2363ae2 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -105,7 +105,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) { byte *doc=*start; - uint mwc, length; + uint mwc, length, mbl; param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0); param->plusminus=param->pmsign=0; @@ -146,7 +146,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, } mwc=length=0; - for (word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc)) + 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++) |