database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  stella.local:/home2/mydev/mysql-4.1-axmrg
This commit is contained in:
unknown
2007-11-02 14:48:36 +01:00
parent 6f97c22925 b698b6fd94
commit ac9fea61e8
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
myisam/ft_boolean_search.c
View File

@ -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) if (cs->coll->instr(cs, p0, e0 - p0, s1, e1 - s1, m, 2) != 2)
return(0); 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]))) (!e_before || p0 + m[1].end == e0 || !true_word_char(cs, p0[m[1].end])))
return(1); return(1);
p0+= m[1].beg; p0+= m[1].beg;

6
mysql-test/r/fulltext.result
View File

@ -454,3 +454,9 @@ ALTER TABLE t1 DISABLE KEYS;
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test'); SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
ERROR HY000: Can't find FULLTEXT index matching the column list ERROR HY000: Can't find FULLTEXT index matching the column list
DROP TABLE t1; 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;

8
mysql-test/t/fulltext.test
View File

@ -379,4 +379,12 @@ ALTER TABLE t1 DISABLE KEYS;
SELECT * FROM t1 WHERE MATCH(a) AGAINST('test'); SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
DROP TABLE t1; 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 # End of 4.1 tests