diff options
| author | unknown <serg@serg.mylan> | 2005-11-26 20:50:22 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-11-26 20:50:22 +0100 |
| commit | b1dc9db137af4b99b1621f124962432659278765 (patch) | |
| tree | ff91cd9f90a6de56efafeda989b27a1857dace82 | |
| parent | 2a1ae3a5e3cbc7bb076c91ba0f8b5e6242319b28 (diff) | |
| parent | 8778a5df5ad07f16bc1bb07bed7a5b91ec82d740 (diff) | |
| download | mariadb-git-b1dc9db137af4b99b1621f124962432659278765.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| -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 8e4769ebc75..fad8b5c4273 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -147,8 +147,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 87551f96a13..ebd6880a10e 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -432,4 +432,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 7c7927b638b..1399b9bfdff 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 |