diff options
author | unknown <svoj@mysql.com> | 2005-11-12 11:25:14 +0400 |
---|---|---|
committer | unknown <svoj@mysql.com> | 2005-11-12 11:25:14 +0400 |
commit | dc44851352f68e240074ecc571216a8c2503ae0b (patch) | |
tree | 5124816e3828fbbe10b9d6f7b532f69567451db1 /myisam | |
parent | cde1be69d673d66ad1dec4b7b90a0320e8e3e83b (diff) | |
download | mariadb-git-dc44851352f68e240074ecc571216a8c2503ae0b.tar.gz |
Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8
myisam/ft_parser.c:
word->len calculation correction.
mysql-test/r/fulltext.result:
Test case for bug#5686.
mysql-test/t/fulltext.test:
Test case for bug#5686.
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/ft_parser.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 0b1e68b0d70..8e4769ebc75 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -188,8 +188,10 @@ byte ft_simple_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++; word->len= (uint)(doc-word->pos) - mwc; |