diff options
| author | unknown <serg@serg.mylan> | 2005-11-26 20:23:20 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-11-26 20:23:20 +0100 |
| commit | 76c4dda1cf54e71ba73d85c2fa5f523f5bf207b9 (patch) | |
| tree | 03b7d875d0326d62fd6f1e60656580f126e968de | |
| parent | 8fc4efe657899dbcebb4dbdc907a60ab03200f07 (diff) | |
| parent | 8778a5df5ad07f16bc1bb07bed7a5b91ec82d740 (diff) | |
| download | mariadb-git-76c4dda1cf54e71ba73d85c2fa5f523f5bf207b9.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
myisam/ft_parser.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
| -rw-r--r-- | myisam/ft_parser.c | 4 | ||||
| -rw-r--r-- | mysql-test/r/fulltext.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index 9198f89ee35..6e79696bd6e 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -149,8 +149,10 @@ byte ft_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++; param->prev='A'; /* be sure *prev is true_word_char */ word->len= (uint)(doc-word->pos) - mwc; diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index f0d323670e0..7e2e0a56212 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -433,4 +433,7 @@ INSERT INTO t1 VALUES('testword\'\''); SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE); a testword'' +SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE); +a +testword'' DROP TABLE t1; diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index b52c5d0ec08..ea92ec944ed 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -354,6 +354,7 @@ SET myisam_repair_threads=@@global.myisam_repair_threads; # INSERT INTO t1 VALUES('testword\'\''); SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE); +SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE); DROP TABLE t1; # End of 4.1 tests |