diff options
author | unknown <antony@ppcg5.local> | 2007-07-06 09:00:40 -0700 |
---|---|---|
committer | unknown <antony@ppcg5.local> | 2007-07-06 09:00:40 -0700 |
commit | fec6d3f134a524ba3ed62e8acdc11d314a406558 (patch) | |
tree | cd445c5e59684cfa8b43a3946c53d9f24fb26de4 /myisam | |
parent | 7edcebc97a817f7b157df86504e937600a2716d2 (diff) | |
parent | dc308c51470b529eb0e9d05bbab9ef88b7cff493 (diff) | |
download | mariadb-git-fec6d3f134a524ba3ed62e8acdc11d314a406558.tar.gz |
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'myisam')
-rw-r--r-- | myisam/ft_parser.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 6c79f9249cf..6d68542e4e2 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -111,7 +111,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, while (doc<end) { - for (;doc<end;doc++) + for (; doc < end; doc+= mbl) { if (true_word_char(cs,*doc)) break; if (*doc == FTB_RQUOT && param->quot) @@ -120,6 +120,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end, *start=doc+1; return 3; /* FTB_RBR */ } + mbl= my_mbcharlen(cs, *(uchar *)doc); if (!param->quot) { if (*doc == FTB_LBR || *doc == FTB_RBR || *doc == FTB_LQUOT) @@ -187,10 +188,11 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const byte *end, do { - for (;; doc++) + for (;; doc+= mbl) { if (doc >= end) DBUG_RETURN(0); if (true_word_char(cs, *doc)) break; + mbl= my_mbcharlen(cs, *(uchar *)doc); } mwc= length= 0; |