diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-30 22:25:03 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-11-30 22:25:03 +0400 |
| commit | 65b77b9df6c0cb53a7b77e83d9e3a74d5c07972f (patch) | |
| tree | 03a994323d8c93ed20824407f53f434e5271d201 /include | |
| parent | 69f539affb105514158c34f595be835d45029f76 (diff) | |
| parent | c33c92d0f2d94e796aa403b80b29477e3400659b (diff) | |
| download | mariadb-git-65b77b9df6c0cb53a7b77e83d9e3a74d5c07972f.tar.gz | |
Merge mysql.com:/home/hf/work/31890/my51-31890
into mysql.com:/home/hf/work/mrg/my51-mrg
mysql-test/r/partition.result:
SCCS merged
mysql-test/t/partition.test:
merging
Diffstat (limited to 'include')
| -rw-r--r-- | include/queues.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/queues.h b/include/queues.h index 4fd0f72484e..d01b73ba999 100644 --- a/include/queues.h +++ b/include/queues.h @@ -31,8 +31,8 @@ typedef struct st_queue { void *first_cmp_arg; uint elements; uint max_elements; - uint offset_to_key; /* compare is done on element+offset */ - int max_at_top; /* Set if queue_top gives max */ + uint offset_to_key; /* compare is done on element+offset */ + int max_at_top; /* Normally 1, set to -1 if queue_top gives max */ int (*compare)(void *, uchar *,uchar *); uint auto_extent; } QUEUE; @@ -43,7 +43,7 @@ typedef struct st_queue { #define queue_replaced(queue) _downheap(queue,1) #define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg #define queue_set_max_at_top(queue, set_arg) \ - (queue)->max_at_top= set_arg ? (-1 ^ 1) : 0 + (queue)->max_at_top= set_arg ? -1 : 1 typedef int (*queue_compare)(void *,uchar *, uchar *); int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key, |