diff options
author | Michael Widenius <monty@askmonty.org> | 2010-11-02 11:03:33 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-11-02 11:03:33 +0200 |
commit | c4a5cf111bb1a2ecc2de14478a679283b081e3b2 (patch) | |
tree | 06fc72775ec3407f9d9a31187c41e879255ec813 /include | |
parent | d48a8b60345c5b5f95c2ce590f7032a7c9f87c4b (diff) | |
download | mariadb-git-c4a5cf111bb1a2ecc2de14478a679283b081e3b2.tar.gz |
Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_lock_kill
Fixed compiler warnings.
include/queues.h:
Added prototype for queue_replace()
mysys/queues.c:
Fixed wrong queue_replace()
mysys/thr_alarm.c:
Added DBUG_PRINT
sql/item_subselect.cc:
Check return value of ha_rnd_init().
(Fixes compiler warnings)
sql/sql_class.cc:
Fixed wrong test
sql/sql_show.cc:
Removed not used variable.
Diffstat (limited to 'include')
-rw-r--r-- | include/queues.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/queues.h b/include/queues.h index f5f09359cbc..efe78feb264 100644 --- a/include/queues.h +++ b/include/queues.h @@ -51,7 +51,6 @@ typedef struct st_queue { #define queue_top(queue) ((queue)->root[1]) #define queue_element(queue,index) ((queue)->root[index]) #define queue_end(queue) ((queue)->root[(queue)->elements]) -#define queue_replace(queue, idx) _downheap(queue, idx, (queue)->root[idx]) #define queue_replace_top(queue) _downheap(queue, 1, (queue)->root[1]) #define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg #define queue_set_max_at_top(queue, set_arg) \ @@ -72,6 +71,8 @@ void delete_queue(QUEUE *queue); void queue_insert(QUEUE *queue,uchar *element); int queue_insert_safe(QUEUE *queue, uchar *element); uchar *queue_remove(QUEUE *queue,uint idx); +void queue_replace(QUEUE *queue,uint idx); + #define queue_remove_all(queue) { (queue)->elements= 0; } #define queue_is_full(queue) (queue->elements == queue->max_elements) void _downheap(QUEUE *queue, uint idx, uchar *element); |