Commit 8778a5df authored by unknown's avatar unknown
Browse files

followup for for the bug#5686

parent 74ae82f5

myisam/ft_parser.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/fulltext.result

+3 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/fulltext.test

+1 −0
Original line number Diff line number Diff line
@@ -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