diff options
author | Michael Widenius <monty@mysql.com> | 2008-10-11 11:27:03 +0300 |
---|---|---|
committer | Michael Widenius <monty@mysql.com> | 2008-10-11 11:27:03 +0300 |
commit | 56100f3a49e528315bab335edd95542590a48e61 (patch) | |
tree | df7b9d491e2cfc2c23afa2d60af01d332a8d8d10 /mysys/lf_alloc-pin.c | |
parent | f47e003e1bfc56c2bf5d0f144a35517f526b538b (diff) | |
parent | ade71b252276f8cd3de2b325074ef1dfb5694daf (diff) | |
download | mariadb-git-56100f3a49e528315bab335edd95542590a48e61.tar.gz |
Merged 5.1 maria with 5.1 maria team tree. Automerge.
Diffstat (limited to 'mysys/lf_alloc-pin.c')
-rw-r--r-- | mysys/lf_alloc-pin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c index 4fae8e37ddb..7c3e3785b68 100644 --- a/mysys/lf_alloc-pin.c +++ b/mysys/lf_alloc-pin.c @@ -320,7 +320,7 @@ static int match_pins(LF_PINS *el, void *addr) #define available_stack_size(CUR,END) (long) ((char*)(END) - (char*)(CUR)) #endif -#define next_node(P, X) (*((uchar **)(((uchar *)(X)) + (P)->free_ptr_offset))) +#define next_node(P, X) (*((uchar * volatile *)(((uchar *)(X)) + (P)->free_ptr_offset))) #define anext_node(X) next_node(&allocator->pinbox, (X)) /* |