Commit 377f1870 authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Merge stella.local:/home2/mydev/mysql-4.1-ateam 

into  stella.local:/home2/mydev/mysql-4.1-axmrg
parents 8d4b8423 cbd3dfbb

myisam/ft_boolean_search.c

+2 −1
Original line number Diff line number Diff line
@@ -446,7 +446,8 @@ static int _ftb_strstr(const byte *s0, const byte *e0, 
  {

    if (cs->coll->instr(cs, p0, e0 - p0, s1, e1 - s1, m, 2) != 2)

      return(0);

    if ((!s_after || p0 + m[1].beg == s0 || !true_word_char(cs, p0[m[1].beg-1])) &&

    if ((!s_after || p0 + m[1].beg == s0 ||

         !true_word_char(cs, p0[(int) m[1].beg - 1])) &&

        (!e_before || p0 + m[1].end == e0 || !true_word_char(cs, p0[m[1].end])))

      return(1);

    p0+= m[1].beg;

mysql-test/r/fulltext.result

+6 −0
Original line number Diff line number Diff line
@@ -454,3 +454,9 @@ ALTER TABLE t1 DISABLE KEYS; 
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');

ERROR HY000: Can't find FULLTEXT index matching the column list

DROP TABLE t1;

CREATE TABLE t1(a TEXT);

INSERT INTO t1 VALUES(' aaaaa aaaa');

SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);

a

 aaaaa aaaa

DROP TABLE t1;

mysql-test/t/fulltext.test

+8 −0
Original line number Diff line number Diff line
@@ -379,4 +379,12 @@ ALTER TABLE t1 DISABLE KEYS; 
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');

DROP TABLE t1;



#

# BUG#11392 - fulltext search bug

#

CREATE TABLE t1(a TEXT);

INSERT INTO t1 VALUES(' aaaaa aaaa');

SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);

DROP TABLE t1;



# End of 4.1 tests