diff options
| -rw-r--r-- | mysql-test/r/fulltext.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 2 | ||||
| -rw-r--r-- | mysys/queues.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index 839db356e74..68d3b6ecc62 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -55,7 +55,7 @@ Full-text indexes are called collections 1 Only MyISAM tables support collections 2 Function MATCH ... AGAINST() is used to do a search 0 Full-text search in MySQL implements vector space model 0 -select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE); +select * from t1 where MATCH a AGAINST ("sear*" IN BOOLEAN MODE); a b Full-text search in MySQL implements vector space model delete from t1 where a like "MySQL%"; diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index ab3fc194891..ce003ee33ad 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -31,7 +31,7 @@ select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t # boolean w/o index: -select * from t1 where MATCH a AGAINST ("search" IN BOOLEAN MODE); +select * from t1 where MATCH a AGAINST ("sear*" IN BOOLEAN MODE); #update/delete with fulltext index diff --git a/mysys/queues.c b/mysys/queues.c index 087df48eb72..50ef3944a3f 100644 --- a/mysys/queues.c +++ b/mysys/queues.c @@ -173,7 +173,11 @@ static int queue_fix_cmp(QUEUE *queue, void **a, void **b) (char*) (*b)+queue->offset_to_key); } - /* Fix heap when every element was changed */ +/* Fix heap when every element was changed + actually, it can be done in linear time, + not in n*log(n), but some code (myisam/ft_boolean_search.c) + requires a strict order here, not just a queue property +*/ void queue_fix(QUEUE *queue) { qsort2(queue->root+1,queue->elements, sizeof(void *), |