summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvoj@june.mysql.com <>2007-11-06 11:54:56 +0400
committersvoj@june.mysql.com <>2007-11-06 11:54:56 +0400
commit1cce1a0be1d9bad7f6a6b21bc00422e22a6cb3f8 (patch)
treef1bcd323053e734dfe6a2b85baeb30cc1d522ce4
parentf193dd22fe03744210c984c7a328eaf4c5a0ffaa (diff)
parentf8c2f9d195a9aa0fd0ba53f1ed0fec6589e19749 (diff)
downloadmariadb-git-1cce1a0be1d9bad7f6a6b21bc00422e22a6cb3f8.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG31950/mysql-5.0-engines
-rw-r--r--myisam/ft_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c
index 6d68542e4e2..1d3a19dd8c6 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.c
@@ -188,7 +188,7 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const byte *end,
do
{
- for (;; doc+= mbl)
+ for (;; doc+= (mbl ? mbl : 1))
{
if (doc >= end) DBUG_RETURN(0);
if (true_word_char(cs, *doc)) break;