diff options
author | unknown <serg@serg.mysql.com> | 2001-12-11 14:40:56 +0100 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-12-11 14:40:56 +0100 |
commit | a3bbc574cf06313d6e362b6b861cf3aab62d5b9e (patch) | |
tree | b5cdf1ea38e8f1be9349c1caffb845b362ab7c83 /mysys | |
parent | 718825a9b0b9517201b9109c4f88cfaa6b2f20a6 (diff) | |
parent | e8b18cc0c5521f0a7fbc5ccb1e470070101ef9b6 (diff) | |
download | mariadb-git-a3bbc574cf06313d6e362b6b861cf3aab62d5b9e.tar.gz |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_update.c:
Auto merged
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/queues.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 *), |