diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-15 19:22:00 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-15 19:22:00 +0200 |
| commit | bb349787ffb803caeb45fbf0ad746cd81b93bedb (patch) | |
| tree | 3c844124bd105797f205a4fb0e13022212552519 /myisam | |
| parent | d9c7aaf23ff30675682775864c269bde84a3bc03 (diff) | |
| parent | 69fae29c589e92233cf63ae32bffb9c6023d3780 (diff) | |
| download | mariadb-git-bb349787ffb803caeb45fbf0ad746cd81b93bedb.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
myisam/ft_parser.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
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 2fad2363ae2..9198f89ee35 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -196,8 +196,10 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const 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; |